[Xulu-commits] r22 - in trunk: defaults dist lib lib/schmitzm src/edu/bonn/xulu/plugin/gui src/edu/bonn/xulu/plugin/vis
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Mar 11 13:29:38 CET 2009
Author: mojays
Date: 2009-03-11 13:29:25 +0100 (Wed, 11 Mar 2009)
New Revision: 22
Removed:
trunk/lib/Adagios/
Modified:
trunk/defaults/.classpath
trunk/defaults/startXULU.bat
trunk/defaults/startXULU.sh
trunk/dist/xulu-src.zip
trunk/dist/xulu.jar
trunk/lib/schmitzm/schmitzm.jar
trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_BasicTable.java
trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_Tree.java
trunk/src/edu/bonn/xulu/plugin/vis/JFreeChartVisualisationTool.java
Log:
dependency of ADAGIOS library removed
Modified: trunk/defaults/.classpath
===================================================================
--- trunk/defaults/.classpath 2009-03-05 17:17:15 UTC (rev 21)
+++ trunk/defaults/.classpath 2009-03-11 12:29:25 UTC (rev 22)
@@ -4,7 +4,6 @@
<classpathentry excluding="**/.svn/" kind="src" path="src"/>
<classpathentry kind="lib" path="resource"/>
<classpathentry kind="lib" path="lib/schmitzm/schmitzm.jar"/>
- <classpathentry kind="lib" path="lib/Adagios/AdagiosJavaLib.jar"/>
<classpathentry kind="lib" path="lib/geotoolsArcGrid/gt2-arcgrid-2.3.0-M0.jar"/>
<classpathentry kind="lib" path="lib/geotoolsArcGrid/gt2-render-2.4.2.jar"/>
<classpathentry kind="lib" path="lib/geotoolsArcGrid/junit-4.4.jar"/>
Modified: trunk/defaults/startXULU.bat
===================================================================
--- trunk/defaults/startXULU.bat 2009-03-05 17:17:15 UTC (rev 21)
+++ trunk/defaults/startXULU.bat 2009-03-11 12:29:25 UTC (rev 22)
@@ -56,9 +56,6 @@
rem ####################################################
set LIB_ROOT=%SCHMITZM_LIB_ROOT%
-rem ##### Where to find "ADAGIOS library" #####
-set ADAGIOS_ROOT=%LIB_ROOT%\Adagios
-
rem ##### Where to find "GeoTools" #####
set GT_ROOT=%LIB_ROOT%\gt2-2.4.4
rem ##### Where to find gt2-arcgrid-2.1.x.jar (from SpearfishDemo) #####
@@ -74,7 +71,6 @@
set JFREECHART_ROOT=%LIB_ROOT%\jFreeChart
rem ##### combine the external libs #####
-set ADAGIOS_LIB=%ADAGIOS_ROOT%\AdagiosJavaLib.jar
set GT_LIB=%GT_ROOT%\*
set GT_LIB=%GT_LIB%;%GT_ARCGRID_ROOT%\gt2-arcgrid-2.3.0-M0.jar;%GT_ARCGRID_ROOT%\junit-4.4.jar
set LOG4J_LIB=%LOG4J_ROOT%\log4j-1.2.14.jar
@@ -82,7 +78,7 @@
rem set JINI_LIB=%JINI_ROOT%\lib\*;%JINI_ROOT%\lib-dl\*;%JINI_ROOT%\lib-ext\*
set JFREECHART_LIB=%JFREECHART_ROOT%\jfreechart-1.0.6.jar;%JFREECHART_ROOT%\jcommon-1.0.10.jar
-set LIB_ALL=%LIB_ALL%;%ADAGIOS_LIB%;%GT_LIB%;%LOG4J_LIB%;%JINI_LIB%;%JFREECHART_LIB%
+set LIB_ALL=%LIB_ALL%;%GT_LIB%;%LOG4J_LIB%;%JINI_LIB%;%JFREECHART_LIB%
rem ##### combine the native libs #####
set JAI_NATIVE=%JAI_ROOT%\native_win
Modified: trunk/defaults/startXULU.sh
===================================================================
--- trunk/defaults/startXULU.sh 2009-03-05 17:17:15 UTC (rev 21)
+++ trunk/defaults/startXULU.sh 2009-03-11 12:29:25 UTC (rev 22)
@@ -63,9 +63,6 @@
##### Where to find gt2-arcgrid-2.1.x.jar (from SpearfishDemo) #####
GT_ARCGRID_ROOT=$LIB_ROOT/geotoolsArcGrid
-##### Where to find "Adagios" #####
-ADAGIOS_ROOT=$LIB_ROOT/Adagios
-
##### Where to find "Log4j" #####
LOG4J_ROOT=$LIB_ROOT/log4j-1.2.14
@@ -83,14 +80,13 @@
JAI_LIB=$JAI_ROOT/*
GT_LIB=$GT_ROOT/*
GT_LIB=$GT_LIB:$GT_ARCGRID_ROOT/gt2-arcgrid-2.3.0-M0.jar:$GT_ARCGRID_ROOT/junit-4.4.jar
-ADAGIOS_LIB=$ADAGIOS_ROOT/AdagiosJavaLib.jar
JINI_LIB=$JINI_ROOT/lib/*:$JINI_ROOT/lib-dl/*:$JINI_ROOT/lib-ext/*
# set JINI_LIB=$JINI_ROOT/lib/jsk-platform.jar;$JINI_ROOT/lib/tools.jar
LOG4J_LIB=$LOG4J_ROOT/log4j-1.2.14.jar
#R_LIB=$R_ROOT/JRI.jar;$R_ROOT/libjri.so;$R_ROOT/libR.so # segfaulted on Intrepid
JFREECHART_LIB=$JFREECHART_ROOT/jfreechart-1.0.6.jar:$JFREECHART_ROOT/jcommon-1.0.10.jar
-LIB_ALL=$XULU_LIB:$SCHMITZM_LIB:$JAI_LIB:$GT_LIB:$ADAGIOS_LIB:$LOG4J_LIB:$JINI_LIB:$JFREECHART_LIB #:$R_LIB
+LIB_ALL=$XULU_LIB:$SCHMITZM_LIB:$JAI_LIB:$GT_LIB:$LOG4J_LIB:$JINI_LIB:$JFREECHART_LIB #:$R_LIB
##### combine the native libs #####
JAI_NATIVE=$JAI_ROOT/native_linux
Modified: trunk/dist/xulu-src.zip
===================================================================
(Binary files differ)
Modified: trunk/dist/xulu.jar
===================================================================
(Binary files differ)
Modified: trunk/lib/schmitzm/schmitzm.jar
===================================================================
(Binary files differ)
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_BasicTable.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_BasicTable.java 2009-03-05 17:17:15 UTC (rev 21)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_BasicTable.java 2009-03-11 12:29:25 UTC (rev 22)
@@ -28,8 +28,8 @@
//import java.io.FileInputStream;
//import java.io.FileOutputStream;
-import adagios.swing.MultiSplitPane;
-
+import schmitzm.swing.MultiSplitPane;
+
import schmitzm.swing.event.PopupMenuListener;
import schmitzm.data.event.ObjectListener;
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_Tree.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_Tree.java 2009-03-05 17:17:15 UTC (rev 21)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_Tree.java 2009-03-11 12:29:25 UTC (rev 22)
@@ -31,11 +31,10 @@
import java.util.Enumeration;
import java.io.File;
-import adagios.swing.MultiSplitPane;
-
import schmitzm.io.FileInputStream;
import schmitzm.io.FileOutputStream;
import schmitzm.lang.AlreadyHandledException;
+import schmitzm.swing.MultiSplitPane;
import schmitzm.swing.ObjectDisplayContainer;
import schmitzm.swing.event.PopupMenuListener;
import schmitzm.swing.menu.ObjectMenuItem;
Modified: trunk/src/edu/bonn/xulu/plugin/vis/JFreeChartVisualisationTool.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/vis/JFreeChartVisualisationTool.java 2009-03-05 17:17:15 UTC (rev 21)
+++ trunk/src/edu/bonn/xulu/plugin/vis/JFreeChartVisualisationTool.java 2009-03-11 12:29:25 UTC (rev 22)
@@ -44,6 +44,7 @@
import schmitzm.swing.JPanel;
import schmitzm.swing.ButtonGroup;
+import schmitzm.swing.MultiSplitPane;
import schmitzm.swing.table.MutableTable;
import schmitzm.swing.table.AbstractMutableTableModel;
import schmitzm.data.property.Property;
@@ -53,8 +54,6 @@
import schmitzm.data.property.MatrixProperty;
import schmitzm.data.property.PropertyReadAccess;
-import adagios.swing.MultiSplitPane;
-
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.VisualisationTool;
import edu.bonn.xulu.appl.VisualisationUpdateListener;
@@ -63,12 +62,6 @@
import static schmitzm.jfree.JFreeChartUtil.RESOURCE;
import static edu.bonn.xulu.appl.XuluConstants.XULU_VIS_RES;
-// nur fuer Doku
-
-
-
-
-
/**
* Diese Klasse stellt ein Visualisierungstool dar, in dem Zahlenreihen in Form
* von Charts angezeigt werden koennen. Folgende Datentypen werden unterstuetzt:
More information about the Xulu-commits
mailing list