Browse Source

- update SDK library definitions for NiftyGUI 1.4.1

Normen Hansen 10 years ago
parent
commit
3be3091851

+ 94 - 84
jme3-core-libraries/nbproject/project.xml

@@ -41,94 +41,96 @@
         <package>net.java.games.input</package>
         <package>net.java.games.util.plugins</package>
         <package>net.java.games.util</package>
-        <package>de.lessvoid.nifty.batch</package>
-        <package>de.lessvoid.nifty.batch.spi</package>
-        <package>de.lessvoid.nifty.builder</package>
+        <package>de.lessvoid.xml.tools</package>
+        <package>de.lessvoid.xml.xpp3</package>
+        <package>de.lessvoid.xml.lwxs.processor</package>
+        <package>de.lessvoid.xml.lwxs</package>
+        <package>de.lessvoid.xml.lwxs.elements</package>
         <package>de.lessvoid.nifty</package>
-        <package>de.lessvoid.nifty.controls</package>
-        <package>de.lessvoid.nifty.controls.dynamic.attributes</package>
-        <package>de.lessvoid.nifty.controls.dynamic</package>
-        <package>de.lessvoid.nifty.effects</package>
-        <package>de.lessvoid.nifty.effects.impl</package>
+        <package>de.lessvoid.nifty.nulldevice</package>
+        <package>de.lessvoid.nifty.spi.time</package>
+        <package>de.lessvoid.nifty.spi.time.impl</package>
+        <package>de.lessvoid.nifty.spi.sound</package>
+        <package>de.lessvoid.nifty.spi.render</package>
+        <package>de.lessvoid.nifty.spi.input</package>
+        <package>de.lessvoid.nifty.tools</package>
+        <package>de.lessvoid.nifty.tools.time.interpolator</package>
+        <package>de.lessvoid.nifty.tools.time</package>
+        <package>de.lessvoid.nifty.tools.pulsate</package>
+        <package>de.lessvoid.nifty.tools.pulsate.provider</package>
+        <package>de.lessvoid.nifty.tools.factories</package>
+        <package>de.lessvoid.nifty.tools.resourceloader</package>
+        <package>de.lessvoid.nifty.sound</package>
         <package>de.lessvoid.nifty.elements</package>
-        <package>de.lessvoid.nifty.elements.events</package>
-        <package>de.lessvoid.nifty.elements.render</package>
         <package>de.lessvoid.nifty.elements.tools</package>
+        <package>de.lessvoid.nifty.elements.render</package>
+        <package>de.lessvoid.nifty.elements.events</package>
+        <package>de.lessvoid.nifty.render</package>
+        <package>de.lessvoid.nifty.render.batch</package>
+        <package>de.lessvoid.nifty.render.batch.spi</package>
+        <package>de.lessvoid.nifty.render.batch.spi.core</package>
+        <package>de.lessvoid.nifty.render.batch.core</package>
+        <package>de.lessvoid.nifty.render.image</package>
+        <package>de.lessvoid.nifty.render.image.renderstrategy</package>
+        <package>de.lessvoid.nifty.render.image.areaprovider</package>
+        <package>de.lessvoid.nifty.render.io</package>
+        <package>de.lessvoid.nifty.builder</package>
+        <package>de.lessvoid.nifty.screen</package>
+        <package>de.lessvoid.nifty.controls.dynamic</package>
+        <package>de.lessvoid.nifty.controls.dynamic.attributes</package>
+        <package>de.lessvoid.nifty.controls</package>
+        <package>de.lessvoid.nifty.input</package>
+        <package>de.lessvoid.nifty.input.mouse</package>
         <package>de.lessvoid.nifty.input.keyboard</package>
         <package>de.lessvoid.nifty.input.mapping</package>
-        <package>de.lessvoid.nifty.input.mouse</package>
-        <package>de.lessvoid.nifty.input</package>
-        <package>de.lessvoid.nifty.layout.align</package>
-        <package>de.lessvoid.nifty.layout</package>
-        <package>de.lessvoid.nifty.layout.manager</package>
-        <package>de.lessvoid.nifty.loaderv2</package>
-        <package>de.lessvoid.nifty.loaderv2.types.apply</package>
+        <package>de.lessvoid.nifty.effects</package>
+        <package>de.lessvoid.nifty.effects.impl</package>
         <package>de.lessvoid.nifty.loaderv2.types</package>
         <package>de.lessvoid.nifty.loaderv2.types.helper</package>
+        <package>de.lessvoid.nifty.loaderv2.types.apply</package>
         <package>de.lessvoid.nifty.loaderv2.types.resolver.style</package>
-        <package>de.lessvoid.nifty.nulldevice</package>
-        <package>de.lessvoid.nifty.render</package>
-        <package>de.lessvoid.nifty.render.image.areaprovider</package>
-        <package>de.lessvoid.nifty.render.image</package>
-        <package>de.lessvoid.nifty.render.image.renderstrategy</package>
-        <package>de.lessvoid.nifty.screen</package>
-        <package>de.lessvoid.nifty.sound</package>
-        <package>de.lessvoid.nifty.spi.input</package>
-        <package>de.lessvoid.nifty.spi.render</package>
-        <package>de.lessvoid.nifty.spi.sound</package>
-        <package>de.lessvoid.nifty.spi.time.impl</package>
-        <package>de.lessvoid.nifty.spi.time</package>
-        <package>de.lessvoid.nifty.tools</package>
-        <package>de.lessvoid.nifty.tools.pulsate.provider</package>
-        <package>de.lessvoid.nifty.tools.pulsate</package>
-        <package>de.lessvoid.nifty.tools.resourceloader</package>
-        <package>de.lessvoid.nifty.tools.time.interpolator</package>
-        <package>de.lessvoid.nifty.tools.time</package>
-        <package>de.lessvoid.xml.lwxs.elements</package>
-        <package>de.lessvoid.xml.lwxs.processor</package>
-        <package>de.lessvoid.xml.lwxs</package>
-        <package>de.lessvoid.xml.tools</package>
-        <package>de.lessvoid.xml.xpp3</package>
-        <package>de.lessvoid.nifty.controls.button.builder</package>
-        <package>de.lessvoid.nifty.controls.button</package>
-        <package>de.lessvoid.nifty.controls.chatcontrol.builder</package>
-        <package>de.lessvoid.nifty.controls.chatcontrol</package>
-        <package>de.lessvoid.nifty.controls.checkbox.builder</package>
-        <package>de.lessvoid.nifty.controls.checkbox</package>
-        <package>de.lessvoid.nifty.controls.console.builder</package>
-        <package>de.lessvoid.nifty.controls.console</package>
-        <package>de.lessvoid.nifty.controls.dragndrop.builder</package>
+        <package>de.lessvoid.nifty.loaderv2</package>
+        <package>de.lessvoid.nifty.layout.manager</package>
+        <package>de.lessvoid.nifty.layout</package>
+        <package>de.lessvoid.nifty.layout.align</package>
+        <package>de.lessvoid.nifty.controls.treebox</package>
+        <package>de.lessvoid.nifty.controls.treebox.builder</package>
+        <package>de.lessvoid.nifty.controls.textfield</package>
+        <package>de.lessvoid.nifty.controls.textfield.filter.delete</package>
+        <package>de.lessvoid.nifty.controls.textfield.filter.input</package>
+        <package>de.lessvoid.nifty.controls.textfield.builder</package>
+        <package>de.lessvoid.nifty.controls.textfield.format</package>
+        <package>de.lessvoid.nifty.controls.messagebox</package>
+        <package>de.lessvoid.nifty.controls.messagebox.builder</package>
         <package>de.lessvoid.nifty.controls.dragndrop</package>
-        <package>de.lessvoid.nifty.controls.dropdown.builder</package>
+        <package>de.lessvoid.nifty.controls.dragndrop.builder</package>
         <package>de.lessvoid.nifty.controls.dropdown</package>
-        <package>de.lessvoid.nifty.controls.imageselect.builder</package>
+        <package>de.lessvoid.nifty.controls.dropdown.builder</package>
         <package>de.lessvoid.nifty.controls.imageselect</package>
-        <package>de.lessvoid.nifty.controls.label.builder</package>
-        <package>de.lessvoid.nifty.controls.label</package>
-        <package>de.lessvoid.nifty.controls.listbox.builder</package>
+        <package>de.lessvoid.nifty.controls.imageselect.builder</package>
+        <package>de.lessvoid.nifty.controls.console.builder</package>
+        <package>de.lessvoid.nifty.controls.console</package>
+        <package>de.lessvoid.nifty.controls.checkbox</package>
+        <package>de.lessvoid.nifty.controls.checkbox.builder</package>
         <package>de.lessvoid.nifty.controls.listbox</package>
+        <package>de.lessvoid.nifty.controls.listbox.builder</package>
+        <package>de.lessvoid.nifty.controls.tabs</package>
+        <package>de.lessvoid.nifty.controls.tabs.builder</package>
         <package>de.lessvoid.nifty.controls.menu</package>
-        <package>de.lessvoid.nifty.controls.messagebox.builder</package>
-        <package>de.lessvoid.nifty.controls.messagebox</package>
-        <package>de.lessvoid.nifty.controls.nullobjects</package>
-        <package>de.lessvoid.nifty.controls.radiobutton.builder</package>
-        <package>de.lessvoid.nifty.controls.radiobutton</package>
-        <package>de.lessvoid.nifty.controls.scrollbar.builder</package>
+        <package>de.lessvoid.nifty.controls.slider</package>
+        <package>de.lessvoid.nifty.controls.slider.builder</package>
+        <package>de.lessvoid.nifty.controls.button</package>
+        <package>de.lessvoid.nifty.controls.button.builder</package>
         <package>de.lessvoid.nifty.controls.scrollbar</package>
-        <package>de.lessvoid.nifty.controls.scrollpanel.builder</package>
+        <package>de.lessvoid.nifty.controls.scrollbar.builder</package>
+        <package>de.lessvoid.nifty.controls.chatcontrol</package>
+        <package>de.lessvoid.nifty.controls.chatcontrol.builder</package>
+        <package>de.lessvoid.nifty.controls.label</package>
+        <package>de.lessvoid.nifty.controls.label.builder</package>
         <package>de.lessvoid.nifty.controls.scrollpanel</package>
-        <package>de.lessvoid.nifty.controls.shared</package>
-        <package>de.lessvoid.nifty.controls.slider.builder</package>
-        <package>de.lessvoid.nifty.controls.slider</package>
-        <package>de.lessvoid.nifty.controls.tabs.builder</package>
-        <package>de.lessvoid.nifty.controls.tabs</package>
-        <package>de.lessvoid.nifty.controls.textfield.builder</package>
-        <package>de.lessvoid.nifty.controls.textfield.filter.delete</package>
-        <package>de.lessvoid.nifty.controls.textfield.filter.input</package>
-        <package>de.lessvoid.nifty.controls.textfield.format</package>
-        <package>de.lessvoid.nifty.controls.textfield</package>
-        <package>de.lessvoid.nifty.controls.treebox.builder</package>
-        <package>de.lessvoid.nifty.controls.treebox</package>
+        <package>de.lessvoid.nifty.controls.scrollpanel.builder</package>
+        <package>de.lessvoid.nifty.controls.radiobutton</package>
+        <package>de.lessvoid.nifty.controls.radiobutton.builder</package>
         <package>de.lessvoid.nifty.controls.window.builder</package>
         <package>de.lessvoid.nifty.controls.window</package>
         <package>javax.xml.namespace</package>
@@ -148,12 +150,16 @@
         <package>org.bushe.swing.event.annotation</package>
         <package>org.bushe.swing.event.generics</package>
         <package>org.bushe.swing.exception</package>
+        <package>javax.annotation</package>
+        <package>javax.annotation.concurrent</package>
+        <package>javax.annotation.meta</package>
+        <package>org.jglfont.spi</package>
         <package>org.jglfont</package>
-        <package>org.jglfont.impl</package>
+        <package>org.jglfont.impl.format</package>
         <package>org.jglfont.impl.format.angelcode</package>
         <package>org.jglfont.impl.format.angelcode.line</package>
-        <package>org.jglfont.impl.format</package>
-        <package>org.jglfont.spi</package>
+        <package>org.jglfont.impl.format.awt</package>
+        <package>org.jglfont.impl</package>
       </public-packages>
       <class-path-extension>
         <runtime-relative-path>ext/jbullet.jar</runtime-relative-path>
@@ -208,16 +214,16 @@
         <binary-origin>release/modules/ext/jinput-platform-2.0.5-natives-osx.jar</binary-origin>
       </class-path-extension>
       <class-path-extension>
-        <runtime-relative-path>ext/nifty-1.3.3.jar</runtime-relative-path>
-        <binary-origin>release/modules/ext/nifty-1.3.3.jar</binary-origin>
+        <runtime-relative-path>ext/nifty-1.4.1.jar</runtime-relative-path>
+        <binary-origin>release/modules/ext/nifty-1.4.1.jar</binary-origin>
       </class-path-extension>
       <class-path-extension>
-        <runtime-relative-path>ext/nifty-default-controls-1.3.3.jar</runtime-relative-path>
-        <binary-origin>release/modules/ext/nifty-default-controls-1.3.3.jar</binary-origin>
+        <runtime-relative-path>ext/nifty-default-controls-1.4.1.jar</runtime-relative-path>
+        <binary-origin>release/modules/ext/nifty-default-controls-1.4.1.jar</binary-origin>
       </class-path-extension>
       <class-path-extension>
-        <runtime-relative-path>ext/nifty-style-black-1.3.3.jar</runtime-relative-path>
-        <binary-origin>release/modules/ext/nifty-style-black-1.3.3.jar</binary-origin>
+        <runtime-relative-path>ext/nifty-style-black-1.4.1.jar</runtime-relative-path>
+        <binary-origin>release/modules/ext/nifty-style-black-1.4.1.jar</binary-origin>
       </class-path-extension>
       <class-path-extension>
         <runtime-relative-path>ext/xpp3-1.1.4c.jar</runtime-relative-path>
@@ -228,8 +234,12 @@
         <binary-origin>release/modules/ext/eventbus-1.4.jar</binary-origin>
       </class-path-extension>
       <class-path-extension>
-        <runtime-relative-path>ext/jglfont-core-1.3.jar</runtime-relative-path>
-        <binary-origin>release/modules/ext/jglfont-core-1.3.jar</binary-origin>
+        <runtime-relative-path>ext/jsr305-2.0.2.jar</runtime-relative-path>
+        <binary-origin>release/modules/ext/jsr305-2.0.2.jar</binary-origin>
+      </class-path-extension>
+      <class-path-extension>
+        <runtime-relative-path>ext/jglfont-core-1.4.jar</runtime-relative-path>
+        <binary-origin>release/modules/ext/jglfont-core-1.4.jar</binary-origin>
       </class-path-extension>
     </data>
   </configuration>

+ 5 - 4
jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-niftygui.xml

@@ -7,12 +7,13 @@
   <volume>
     <type>classpath</type>
     <resource>jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-niftygui-3.1.0-snapshot-github.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-1.3.3.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-default-controls-1.3.3.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-style-black-1.3.3.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-1.4.1.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-default-controls-1.4.1.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-style-black-1.4.1.jar!/</resource>
     <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/xpp3-1.1.4c.jar!/</resource>
     <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/eventbus-1.4.jar!/</resource>
-    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jglfont-core-1.3.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jsr305-2.0.2.jar!/</resource>
+    <resource>jar:nbinst://com.jme3.gde.project.libraries/libs/jglfont-core-1.4.jar!/</resource>
   </volume>
   <volume>
     <type>src</type>