From Tree, fixes for Java bindings

include/osg/ApplicationUsage

@@ -78,7 +78,7 @@ class SG_EXPORT ApplicationUsage
 
         void write(std::ostream& output,const UsageMap& um,unsigned int widthOfOutput=80,bool showDefaults=false,const UsageMap& ud=UsageMap());
         
-        void write(std::ostream& output,unsigned int type=COMMAND_LINE_OPTION|ENVIRONMENTAL_VARIABLE|KEYBOARD_MOUSE_BINDING, unsigned int widthOfOutput=80,bool showDefaults=false);
+        void write(std::ostream& output,unsigned int type=COMMAND_LINE_OPTION, unsigned int widthOfOutput=80,bool showDefaults=false);
 
     protected:
     

include/osgParticle/ParticleEffect

@@ -33,15 +33,15 @@ namespace osgParticle
         virtual bool isSameKindAs(const osg::Object *obj) const { return dynamic_cast<const ParticleEffect*>(obj) != 0; }
         virtual void accept(osg::NodeVisitor& nv) { if (nv.validNodeMask(*this)) { nv.pushOntoNodePath(this); nv.apply(*this); nv.popFromNodePath(); } }
 
-        void setEmitter(Emitter* emitter);
+        void setEmitter(Emitter* emitter) { _emitter = emitter; }
         Emitter* getEmitter() { return _emitter.get(); }
         const Emitter* getEmitter() const { return _emitter.get(); }
 
-        void setProgram(Program* program);
+        void setProgram(Program* program) { _program = program; }
         Program* getProgram() { return _program.get(); }
         const Program* getProgram() const { return _program.get(); }
         
-        void setParticleSystem(ParticleSystem* ps);
+        void setParticleSystem(ParticleSystem* ps) { _particleSystem = ps; }
         ParticleSystem* getParticleSystem() { return _particleSystem.get(); }
         const ParticleSystem* getParticleSystem() const { return _particleSystem.get(); }
 

include/osgTerrain/DataSet

@@ -377,6 +377,7 @@ class OSGTERRAIN_EXPORT DataSet : public osg::Referenced
                 {
                     if (&rhs==this) return *this;
                     _positionStack = rhs._positionStack;
+                    return *this;
                 }
                 
                 bool operator == (const iterator& rhs) const

src/osg/StateSet.cpp

@@ -744,6 +744,21 @@ void StateSet::removeTextureAttribute(unsigned int unit,StateAttribute::Type typ
     }
 }
 
+void StateSet::removeTextureAttribute(unsigned int unit, StateAttribute* attribute)
+{
+	if (!attribute) return;
+	if (unit>=_textureAttributeList.size()) return;
+
+	AttributeList& attributeList = _textureAttributeList[unit];
+	AttributeList::iterator itr = attributeList.find(attribute->getTypeMemberPair());
+	if (itr!=attributeList.end())
+	{
+		if (itr->second.first != attribute) return;
+
+		setAssociatedTextureModes(unit,itr->second.first.get(),StateAttribute::INHERIT);
+		attributeList.erase(itr);
+	}
+}
 
 StateAttribute* StateSet::getTextureAttribute(unsigned int unit,StateAttribute::Type type)
 {

src/osg/Switch.cpp

@@ -163,7 +163,7 @@ bool Switch::setSingleChildOn(unsigned int pos)
     return true;
 }
 
-#ifdef USE_DEPRECTATED_API
+#ifdef USE_DEPRECATED_API
 void Switch::setValue(int value)
 {
     switch(value)

src/osgDB/GNUmakefile

@@ -2,6 +2,7 @@ TOPDIR = ../..
 include $(TOPDIR)/Make/makedefs 
 
 CXXFILES =\
+        Archive.cpp\
         DatabasePager.cpp\
 	DynamicLibrary.cpp\
 	FileNameUtils.cpp\