From ea2e25c2e64caf3cd3c2c05beeaf1fc1798f445e Mon Sep 17 00:00:00 2001 From: Normen Hansen Date: Mon, 16 Feb 2015 12:50:14 +0100 Subject: [PATCH] - update SDK library definitions for NiftyGUI 1.4.1 --- sdk/jme3-core-libraries/nbproject/project.xml | 178 +++++++++--------- .../gde/project/baselibs/jme3-niftygui.xml | 9 +- 2 files changed, 99 insertions(+), 88 deletions(-) diff --git a/sdk/jme3-core-libraries/nbproject/project.xml b/sdk/jme3-core-libraries/nbproject/project.xml index 61b13901b..19469cf8a 100644 --- a/sdk/jme3-core-libraries/nbproject/project.xml +++ b/sdk/jme3-core-libraries/nbproject/project.xml @@ -41,94 +41,96 @@ net.java.games.input net.java.games.util.plugins net.java.games.util - de.lessvoid.nifty.batch - de.lessvoid.nifty.batch.spi - de.lessvoid.nifty.builder + de.lessvoid.xml.tools + de.lessvoid.xml.xpp3 + de.lessvoid.xml.lwxs.processor + de.lessvoid.xml.lwxs + de.lessvoid.xml.lwxs.elements de.lessvoid.nifty - de.lessvoid.nifty.controls - de.lessvoid.nifty.controls.dynamic.attributes - de.lessvoid.nifty.controls.dynamic - de.lessvoid.nifty.effects - de.lessvoid.nifty.effects.impl + de.lessvoid.nifty.nulldevice + de.lessvoid.nifty.spi.time + de.lessvoid.nifty.spi.time.impl + de.lessvoid.nifty.spi.sound + de.lessvoid.nifty.spi.render + de.lessvoid.nifty.spi.input + de.lessvoid.nifty.tools + de.lessvoid.nifty.tools.time.interpolator + de.lessvoid.nifty.tools.time + de.lessvoid.nifty.tools.pulsate + de.lessvoid.nifty.tools.pulsate.provider + de.lessvoid.nifty.tools.factories + de.lessvoid.nifty.tools.resourceloader + de.lessvoid.nifty.sound de.lessvoid.nifty.elements - de.lessvoid.nifty.elements.events - de.lessvoid.nifty.elements.render de.lessvoid.nifty.elements.tools + de.lessvoid.nifty.elements.render + de.lessvoid.nifty.elements.events + de.lessvoid.nifty.render + de.lessvoid.nifty.render.batch + de.lessvoid.nifty.render.batch.spi + de.lessvoid.nifty.render.batch.spi.core + de.lessvoid.nifty.render.batch.core + de.lessvoid.nifty.render.image + de.lessvoid.nifty.render.image.renderstrategy + de.lessvoid.nifty.render.image.areaprovider + de.lessvoid.nifty.render.io + de.lessvoid.nifty.builder + de.lessvoid.nifty.screen + de.lessvoid.nifty.controls.dynamic + de.lessvoid.nifty.controls.dynamic.attributes + de.lessvoid.nifty.controls + de.lessvoid.nifty.input + de.lessvoid.nifty.input.mouse de.lessvoid.nifty.input.keyboard de.lessvoid.nifty.input.mapping - de.lessvoid.nifty.input.mouse - de.lessvoid.nifty.input - de.lessvoid.nifty.layout.align - de.lessvoid.nifty.layout - de.lessvoid.nifty.layout.manager - de.lessvoid.nifty.loaderv2 - de.lessvoid.nifty.loaderv2.types.apply + de.lessvoid.nifty.effects + de.lessvoid.nifty.effects.impl de.lessvoid.nifty.loaderv2.types de.lessvoid.nifty.loaderv2.types.helper + de.lessvoid.nifty.loaderv2.types.apply de.lessvoid.nifty.loaderv2.types.resolver.style - de.lessvoid.nifty.nulldevice - de.lessvoid.nifty.render - de.lessvoid.nifty.render.image.areaprovider - de.lessvoid.nifty.render.image - de.lessvoid.nifty.render.image.renderstrategy - de.lessvoid.nifty.screen - de.lessvoid.nifty.sound - de.lessvoid.nifty.spi.input - de.lessvoid.nifty.spi.render - de.lessvoid.nifty.spi.sound - de.lessvoid.nifty.spi.time.impl - de.lessvoid.nifty.spi.time - de.lessvoid.nifty.tools - de.lessvoid.nifty.tools.pulsate.provider - de.lessvoid.nifty.tools.pulsate - de.lessvoid.nifty.tools.resourceloader - de.lessvoid.nifty.tools.time.interpolator - de.lessvoid.nifty.tools.time - de.lessvoid.xml.lwxs.elements - de.lessvoid.xml.lwxs.processor - de.lessvoid.xml.lwxs - de.lessvoid.xml.tools - de.lessvoid.xml.xpp3 - de.lessvoid.nifty.controls.button.builder - de.lessvoid.nifty.controls.button - de.lessvoid.nifty.controls.chatcontrol.builder - de.lessvoid.nifty.controls.chatcontrol - de.lessvoid.nifty.controls.checkbox.builder - de.lessvoid.nifty.controls.checkbox - de.lessvoid.nifty.controls.console.builder - de.lessvoid.nifty.controls.console - de.lessvoid.nifty.controls.dragndrop.builder + de.lessvoid.nifty.loaderv2 + de.lessvoid.nifty.layout.manager + de.lessvoid.nifty.layout + de.lessvoid.nifty.layout.align + de.lessvoid.nifty.controls.treebox + de.lessvoid.nifty.controls.treebox.builder + de.lessvoid.nifty.controls.textfield + de.lessvoid.nifty.controls.textfield.filter.delete + de.lessvoid.nifty.controls.textfield.filter.input + de.lessvoid.nifty.controls.textfield.builder + de.lessvoid.nifty.controls.textfield.format + de.lessvoid.nifty.controls.messagebox + de.lessvoid.nifty.controls.messagebox.builder de.lessvoid.nifty.controls.dragndrop - de.lessvoid.nifty.controls.dropdown.builder + de.lessvoid.nifty.controls.dragndrop.builder de.lessvoid.nifty.controls.dropdown - de.lessvoid.nifty.controls.imageselect.builder + de.lessvoid.nifty.controls.dropdown.builder de.lessvoid.nifty.controls.imageselect - de.lessvoid.nifty.controls.label.builder - de.lessvoid.nifty.controls.label - de.lessvoid.nifty.controls.listbox.builder + de.lessvoid.nifty.controls.imageselect.builder + de.lessvoid.nifty.controls.console.builder + de.lessvoid.nifty.controls.console + de.lessvoid.nifty.controls.checkbox + de.lessvoid.nifty.controls.checkbox.builder de.lessvoid.nifty.controls.listbox + de.lessvoid.nifty.controls.listbox.builder + de.lessvoid.nifty.controls.tabs + de.lessvoid.nifty.controls.tabs.builder de.lessvoid.nifty.controls.menu - de.lessvoid.nifty.controls.messagebox.builder - de.lessvoid.nifty.controls.messagebox - de.lessvoid.nifty.controls.nullobjects - de.lessvoid.nifty.controls.radiobutton.builder - de.lessvoid.nifty.controls.radiobutton - de.lessvoid.nifty.controls.scrollbar.builder + de.lessvoid.nifty.controls.slider + de.lessvoid.nifty.controls.slider.builder + de.lessvoid.nifty.controls.button + de.lessvoid.nifty.controls.button.builder de.lessvoid.nifty.controls.scrollbar - de.lessvoid.nifty.controls.scrollpanel.builder + de.lessvoid.nifty.controls.scrollbar.builder + de.lessvoid.nifty.controls.chatcontrol + de.lessvoid.nifty.controls.chatcontrol.builder + de.lessvoid.nifty.controls.label + de.lessvoid.nifty.controls.label.builder de.lessvoid.nifty.controls.scrollpanel - de.lessvoid.nifty.controls.shared - de.lessvoid.nifty.controls.slider.builder - de.lessvoid.nifty.controls.slider - de.lessvoid.nifty.controls.tabs.builder - de.lessvoid.nifty.controls.tabs - de.lessvoid.nifty.controls.textfield.builder - de.lessvoid.nifty.controls.textfield.filter.delete - de.lessvoid.nifty.controls.textfield.filter.input - de.lessvoid.nifty.controls.textfield.format - de.lessvoid.nifty.controls.textfield - de.lessvoid.nifty.controls.treebox.builder - de.lessvoid.nifty.controls.treebox + de.lessvoid.nifty.controls.scrollpanel.builder + de.lessvoid.nifty.controls.radiobutton + de.lessvoid.nifty.controls.radiobutton.builder de.lessvoid.nifty.controls.window.builder de.lessvoid.nifty.controls.window javax.xml.namespace @@ -148,12 +150,16 @@ org.bushe.swing.event.annotation org.bushe.swing.event.generics org.bushe.swing.exception + javax.annotation + javax.annotation.concurrent + javax.annotation.meta + org.jglfont.spi org.jglfont - org.jglfont.impl + org.jglfont.impl.format org.jglfont.impl.format.angelcode org.jglfont.impl.format.angelcode.line - org.jglfont.impl.format - org.jglfont.spi + org.jglfont.impl.format.awt + org.jglfont.impl ext/jbullet.jar @@ -208,16 +214,16 @@ release/modules/ext/jinput-platform-2.0.5-natives-osx.jar - ext/nifty-1.3.3.jar - release/modules/ext/nifty-1.3.3.jar + ext/nifty-1.4.1.jar + release/modules/ext/nifty-1.4.1.jar - ext/nifty-default-controls-1.3.3.jar - release/modules/ext/nifty-default-controls-1.3.3.jar + ext/nifty-default-controls-1.4.1.jar + release/modules/ext/nifty-default-controls-1.4.1.jar - ext/nifty-style-black-1.3.3.jar - release/modules/ext/nifty-style-black-1.3.3.jar + ext/nifty-style-black-1.4.1.jar + release/modules/ext/nifty-style-black-1.4.1.jar ext/xpp3-1.1.4c.jar @@ -228,8 +234,12 @@ release/modules/ext/eventbus-1.4.jar - ext/jglfont-core-1.3.jar - release/modules/ext/jglfont-core-1.3.jar + ext/jsr305-2.0.2.jar + release/modules/ext/jsr305-2.0.2.jar + + + ext/jglfont-core-1.4.jar + release/modules/ext/jglfont-core-1.4.jar diff --git a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-niftygui.xml b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-niftygui.xml index f26db7438..c6f21a3c7 100644 --- a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-niftygui.xml +++ b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-niftygui.xml @@ -7,12 +7,13 @@ classpath jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-niftygui-3.1.0-snapshot-github.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-1.3.3.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-default-controls-1.3.3.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-style-black-1.3.3.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-1.4.1.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-default-controls-1.4.1.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-style-black-1.4.1.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/xpp3-1.1.4c.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/eventbus-1.4.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jglfont-core-1.3.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jsr305-2.0.2.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jglfont-core-1.4.jar!/ src