[Xulu-commits] r114 - in trunk: dist lib/gt2-2.6 lib/schmitzm src/appl/data src/appl/parallel/client src/appl/parallel/data src/appl/parallel/data/splittable src/appl/parallel/data/xulugridfile src/appl/parallel/data/xulugridfile/factories src/appl/parallel/gui src/appl/parallel/server src/appl/parallel/spmd src/appl/parallel/spmd/split src/appl/parallel/starter/server src/appl/parallel/test src/appl/parallel/thread src/appl/parallel/util src/appl/plugin/multimodelcontrol src/appl/util src/appl/util/benchmark src/de/skrueger/xulu/plugin/gnur src/edu/bonn/xulu src/edu/bonn/xulu/appl src/edu/bonn/xulu/data src/edu/bonn/xulu/gui src/edu/bonn/xulu/io src/edu/bonn/xulu/model src/edu/bonn/xulu/model/event src/edu/bonn/xulu/plugin/appl src/edu/bonn/xulu/plugin/data/feature src/edu/bonn/xulu/plugin/data/grid src/edu/bonn/xulu/plugin/gui src/edu/bonn/xulu/plugin/io src/edu/bonn/xulu/plugin/io/feature/gt src/edu/bonn/xulu/plugin/io/grid src/edu/bonn/xulu/plugin/io/grid/array src/edu/bonn/xulu/plugin/io/grid/awt src/edu/bonn/xulu/plugin/io/grid/gt src/edu/bonn/xulu/plugin/io/grid/lateloading src/edu/bonn/xulu/plugin/io/misc src/edu/bonn/xulu/plugin/model/ca src/edu/bonn/xulu/plugin/model/ca/agric src/edu/bonn/xulu/plugin/model/ca/fire src/edu/bonn/xulu/plugin/model/ca/reservoir src/edu/bonn/xulu/plugin/model/clue src/edu/bonn/xulu/plugin/model/mrv src/edu/bonn/xulu/plugin/model/parallel src/edu/bonn/xulu/plugin/model/parallel/demo src/edu/bonn/xulu/plugin/model/sleuth src/edu/bonn/xulu/plugin/model/test src/edu/bonn/xulu/plugin/vis src/skrueger/gol
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Jul 11 13:32:33 CEST 2011
Author: mojays
Date: 2011-07-11 13:31:25 +0200 (Mon, 11 Jul 2011)
New Revision: 114
Added:
trunk/lib/gt2-2.6/gt-xsd-filter-2.6.5.jar
trunk/lib/gt2-2.6/gt-xsd-gml2-2.6.5.jar
trunk/lib/gt2-2.6/picocontainer-1.2.jar
trunk/lib/gt2-2.6/xsd-2.2.2.jar
trunk/lib/schmitzm/schmitzm-core-2.6-SNAPSHOT.jar
trunk/lib/schmitzm/schmitzm-gt-2.6-SNAPSHOT.jar
trunk/lib/schmitzm/schmitzm-jfree-2.6-SNAPSHOT.jar
Removed:
trunk/lib/schmitzm/schmitzm-library-2.4-SNAPSHOT.jar
Modified:
trunk/dist/xulu-doc.zip
trunk/dist/xulu-src.zip
trunk/dist/xulu.jar
trunk/src/appl/data/DataLoader.java
trunk/src/appl/data/FactoryLoader.java
trunk/src/appl/data/ImportFactoryLoader.java
trunk/src/appl/data/LateLoadingProxy.java
trunk/src/appl/data/SerializedDataLoader.java
trunk/src/appl/data/WritableGridArrayLoader.java
trunk/src/appl/data/WritableGridLLProxy.java
trunk/src/appl/parallel/client/ClientDataServer.java
trunk/src/appl/parallel/client/RemoteExecutionController.java
trunk/src/appl/parallel/data/AbstractDataHandler.java
trunk/src/appl/parallel/data/PartitionDataHandler.java
trunk/src/appl/parallel/data/WritableGridArrayPartition.java
trunk/src/appl/parallel/data/XuluClientLoader.java
trunk/src/appl/parallel/data/splittable/GridListFactory.java
trunk/src/appl/parallel/data/splittable/GridListFactory_ArcInfoAsciiGrid.java
trunk/src/appl/parallel/data/splittable/MultiGridFactory.java
trunk/src/appl/parallel/data/splittable/MultiGridFactory_ArcInfoAsciiGrid.java
trunk/src/appl/parallel/data/splittable/SingleGridFactory.java
trunk/src/appl/parallel/data/splittable/SingleGridFactory_ArcInfoAsciiGrid.java
trunk/src/appl/parallel/data/splittable/SingleGridFactory_GeoTiff.java
trunk/src/appl/parallel/data/splittable/SplittableGridLLFactory.java
trunk/src/appl/parallel/data/splittable/SplittableLLProxyGrid.java
trunk/src/appl/parallel/data/xulugridfile/GridFileDataLoader.java
trunk/src/appl/parallel/data/xulugridfile/XuluGridFile.java
trunk/src/appl/parallel/data/xulugridfile/XuluGridFileConverter.java
trunk/src/appl/parallel/data/xulugridfile/XuluGridSharedFileSystemLoader.java
trunk/src/appl/parallel/data/xulugridfile/XuluWritableGridFile.java
trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory.java
trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory_ArcInfoAsciiGrid.java
trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory.java
trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory_ArcInfoAsciiGrid.java
trunk/src/appl/parallel/data/xulugridfile/factories/SingleGridFactory.java
trunk/src/appl/parallel/data/xulugridfile/factories/SingleGridFactory_ArcInfoAsciiGrid.java
trunk/src/appl/parallel/data/xulugridfile/factories/XuluGridFactory.java
trunk/src/appl/parallel/gui/ModelControlFrame_parallel.java
trunk/src/appl/parallel/server/PartitionDataManager.java
trunk/src/appl/parallel/server/XuluServer.java
trunk/src/appl/parallel/spmd/AbstractSPMDTask.java
trunk/src/appl/parallel/spmd/MultiDataObject.java
trunk/src/appl/parallel/spmd/SPMDClientController.java
trunk/src/appl/parallel/spmd/SPMDClientInterface.java
trunk/src/appl/parallel/spmd/SPMDTask.java
trunk/src/appl/parallel/spmd/split/SplitMap1DHorizontal.java
trunk/src/appl/parallel/spmd/split/SplitMap1DVertical.java
trunk/src/appl/parallel/spmd/split/SplitMap2D.java
trunk/src/appl/parallel/spmd/split/SplittableGrid.java
trunk/src/appl/parallel/spmd/split/WritableGridPartition.java
trunk/src/appl/parallel/starter/server/XuluServerStarter.java
trunk/src/appl/parallel/starter/server/XuluStarterServerGUI.java
trunk/src/appl/parallel/test/AverageNeighborhoodTestTask.java
trunk/src/appl/parallel/test/AverageNeighborhoodTestTask_MultiGrid.java
trunk/src/appl/parallel/test/PartitialGridTest.java
trunk/src/appl/parallel/test/SPMDTest.java
trunk/src/appl/parallel/test/SPMDTest_MultiGrid.java
trunk/src/appl/parallel/test/SplitMapTest.java
trunk/src/appl/parallel/test/XuluGridTestCase.java
trunk/src/appl/parallel/thread/ComputingResourceThread.java
trunk/src/appl/parallel/thread/DataServerThread.java
trunk/src/appl/parallel/thread/ExecutionThread.java
trunk/src/appl/parallel/util/PartitionUtil.java
trunk/src/appl/plugin/multimodelcontrol/MultiModelControlHandler.java
trunk/src/appl/util/RasterUtil.java
trunk/src/appl/util/benchmark/SimpleBenchmark.java
trunk/src/de/skrueger/xulu/plugin/gnur/GnuRGUI.java
trunk/src/de/skrueger/xulu/plugin/gnur/PropertytypeNotConvertableToRVar.java
trunk/src/de/skrueger/xulu/plugin/gnur/RVar.java
trunk/src/de/skrueger/xulu/plugin/gnur/RVarAdapter.java
trunk/src/de/skrueger/xulu/plugin/gnur/RVarMatrix.java
trunk/src/de/skrueger/xulu/plugin/gnur/RVarScalar.java
trunk/src/de/skrueger/xulu/plugin/gnur/RVarSingleGrid.java
trunk/src/de/skrueger/xulu/plugin/gnur/RVarsTable.java
trunk/src/de/skrueger/xulu/plugin/gnur/RVarsTableModel.java
trunk/src/edu/bonn/xulu/XuluModellingPlatform.java
trunk/src/edu/bonn/xulu/appl/AbstractCommandInterpreter.java
trunk/src/edu/bonn/xulu/appl/AbstractManager.java
trunk/src/edu/bonn/xulu/appl/AbstractXuluPlugin.java
trunk/src/edu/bonn/xulu/appl/DataPool.java
trunk/src/edu/bonn/xulu/appl/EventHandler.java
trunk/src/edu/bonn/xulu/appl/EventManager.java
trunk/src/edu/bonn/xulu/appl/Handler.java
trunk/src/edu/bonn/xulu/appl/ModelControlManager.java
trunk/src/edu/bonn/xulu/appl/RecentImports.java
trunk/src/edu/bonn/xulu/appl/RecentScripts.java
trunk/src/edu/bonn/xulu/appl/ScriptInterpreter.java
trunk/src/edu/bonn/xulu/appl/VisualisationManager.java
trunk/src/edu/bonn/xulu/appl/XuluConstants.java
trunk/src/edu/bonn/xulu/appl/XuluPlugin.java
trunk/src/edu/bonn/xulu/appl/XuluRegistry.java
trunk/src/edu/bonn/xulu/data/AbstractXuluObject.java
trunk/src/edu/bonn/xulu/data/DynamicXuluObject.java
trunk/src/edu/bonn/xulu/data/XuluObject.java
trunk/src/edu/bonn/xulu/gui/DataPoolInputOption.java
trunk/src/edu/bonn/xulu/gui/DataPoolMenu.java
trunk/src/edu/bonn/xulu/gui/DataPoolTreeModel.java
trunk/src/edu/bonn/xulu/gui/ModelContentManagerContainer.java
trunk/src/edu/bonn/xulu/gui/ModelManagerTreeModel.java
trunk/src/edu/bonn/xulu/gui/ObjectOrModelInputOption.java
trunk/src/edu/bonn/xulu/gui/XuluGUIMessages.java
trunk/src/edu/bonn/xulu/gui/XuluGUIUtil.java
trunk/src/edu/bonn/xulu/gui/XuluLanguageManagerFrame.java
trunk/src/edu/bonn/xulu/gui/XuluMainFrame.java
trunk/src/edu/bonn/xulu/gui/XuluMainFrameInfo.java
trunk/src/edu/bonn/xulu/gui/XuluStartingFrame.java
trunk/src/edu/bonn/xulu/io/Factory.java
trunk/src/edu/bonn/xulu/model/AbstractModelContentManager.java
trunk/src/edu/bonn/xulu/model/AbstractModelResource.java
trunk/src/edu/bonn/xulu/model/AbstractStepModel.java
trunk/src/edu/bonn/xulu/model/AbstractXuluModel.java
trunk/src/edu/bonn/xulu/model/ModelContentManager.java
trunk/src/edu/bonn/xulu/model/PropertiesResource.java
trunk/src/edu/bonn/xulu/model/ValuePropertyResource.java
trunk/src/edu/bonn/xulu/model/XuluModel.java
trunk/src/edu/bonn/xulu/model/XuluModelThread.java
trunk/src/edu/bonn/xulu/model/event/AbstractModelEvent.java
trunk/src/edu/bonn/xulu/model/event/ModelAdapter.java
trunk/src/edu/bonn/xulu/model/event/ModelEvent.java
trunk/src/edu/bonn/xulu/model/event/ModelListener.java
trunk/src/edu/bonn/xulu/plugin/appl/DataExportHandler.java
trunk/src/edu/bonn/xulu/plugin/appl/DataScriptInterpreter_Basic.java
trunk/src/edu/bonn/xulu/plugin/appl/DateTimePlugin.java
trunk/src/edu/bonn/xulu/plugin/appl/DateTimeWindowPlugin.java
trunk/src/edu/bonn/xulu/plugin/appl/FileExportHandlerFactory.java
trunk/src/edu/bonn/xulu/plugin/appl/GTVisualisationColorMapPlugin.java
trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGenerator.java
trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGeneratorGUI.java
trunk/src/edu/bonn/xulu/plugin/appl/LoggerPlugin.java
trunk/src/edu/bonn/xulu/plugin/appl/ModelResourceMappingScriptInterpreter_Basic.java
trunk/src/edu/bonn/xulu/plugin/appl/ModelTimeSnifferPlugin.java
trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorGUI.java
trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorPanel.java
trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandler.java
trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandlerFactory.java
trunk/src/edu/bonn/xulu/plugin/appl/XuluRegistryReader_BasicAscii.java
trunk/src/edu/bonn/xulu/plugin/data/feature/SingleFeatureCollection.java
trunk/src/edu/bonn/xulu/plugin/data/grid/GridList.java
trunk/src/edu/bonn/xulu/plugin/data/grid/MultiGrid.java
trunk/src/edu/bonn/xulu/plugin/data/grid/SingleGrid.java
trunk/src/edu/bonn/xulu/plugin/gui/AbstractManagerFrame_BasicTable.java
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/gui/DisplayContainer_GeomAndGrid.java
trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_ListProperty.java
trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_MatrixProperty.java
trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Properties.java
trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Table.java
trunk/src/edu/bonn/xulu/plugin/gui/EventManagerFrame_BasicTable.java
trunk/src/edu/bonn/xulu/plugin/gui/ModelControlContainer.java
trunk/src/edu/bonn/xulu/plugin/gui/ModelControlFrame_Basic.java
trunk/src/edu/bonn/xulu/plugin/gui/PluginManagerFrame_BasicTable.java
trunk/src/edu/bonn/xulu/plugin/gui/RegistryFrame_Tree.java
trunk/src/edu/bonn/xulu/plugin/gui/StatusFrame_BasicTextArea.java
trunk/src/edu/bonn/xulu/plugin/io/IOUtil.java
trunk/src/edu/bonn/xulu/plugin/io/feature/gt/SingleFeatureCollectionFactory_ShapeFile.java
trunk/src/edu/bonn/xulu/plugin/io/grid/WritableGridFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/array/MultiGridFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/array/MultiGridFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory_GeoTiff.java
trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory_GeoTiff.java
trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/awt/MultiGridFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/awt/MultiGridFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_GeoTiff.java
trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory_GeoTiff.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory_GeoTiff.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/MultiGridFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/MultiGridFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_GeoTiff.java
trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/MultiGridFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/MultiGridFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory.java
trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory_ArcInfoAsciiGrid.java
trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory_GeoTiff.java
trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/WritableGridLLFactory.java
trunk/src/edu/bonn/xulu/plugin/io/misc/CAAreaListFactory_ShapeFile.java
trunk/src/edu/bonn/xulu/plugin/io/misc/CASettlementAreaListFactory_ShapeFile.java
trunk/src/edu/bonn/xulu/plugin/io/misc/DynamicXuluObjectFactory_BasicStructure.java
trunk/src/edu/bonn/xulu/plugin/model/ca/MultiCellularAutomaton.java
trunk/src/edu/bonn/xulu/plugin/model/ca/agric/ImpetusCellularAutomaton.java
trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCA.java
trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCAContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModel.java
trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModelContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel.java
trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModelContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Optimized.java
trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Original.java
trunk/src/edu/bonn/xulu/plugin/model/mrv/MultipleResolutionValidation.java
trunk/src/edu/bonn/xulu/plugin/model/mrv/MultipleResolutionValidationContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelParallel.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModel_deterministic.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueParallelTuned.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTask.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTaskTuned.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTask.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTuned.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTunedTask.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodParallelDemoModel.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodSerialDemoModel.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/CopyUrbanInActualLU.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/CopyUrbanInActualLUContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/MultipleResolutionValidation.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/MultipleResolutionValidationContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModel.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibration.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibrationContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibrationSelfModification.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibrationSelfModificationContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModification.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModificationContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModifying.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModifyingContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModel_MC.java
trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModel_MC_ContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/test/TestModel.java
trunk/src/edu/bonn/xulu/plugin/vis/GTEditorTool.java
trunk/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java
trunk/src/edu/bonn/xulu/plugin/vis/JFreeChartVisualisationTool.java
trunk/src/skrueger/gol/GameOfLife.java
trunk/src/skrueger/gol/GameOfLifeContentManager.java
Log:
SCHMITZM library updated to current version (2.6-SNAPSHOT)
Added gt-xsd-filter.jar, gt-xsd-gml2.jar, picocontainer.jar and xsd.jar from Geotools 2.6.5
Modified: trunk/dist/xulu-doc.zip
===================================================================
(Binary files differ)
Modified: trunk/dist/xulu-src.zip
===================================================================
(Binary files differ)
Modified: trunk/dist/xulu.jar
===================================================================
(Binary files differ)
Added: trunk/lib/gt2-2.6/gt-xsd-filter-2.6.5.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/gt2-2.6/gt-xsd-filter-2.6.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/gt2-2.6/gt-xsd-gml2-2.6.5.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/gt2-2.6/gt-xsd-gml2-2.6.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/gt2-2.6/picocontainer-1.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/gt2-2.6/picocontainer-1.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/gt2-2.6/xsd-2.2.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/gt2-2.6/xsd-2.2.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/schmitzm/schmitzm-core-2.6-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/schmitzm/schmitzm-core-2.6-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/schmitzm/schmitzm-gt-2.6-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/schmitzm/schmitzm-gt-2.6-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/lib/schmitzm/schmitzm-jfree-2.6-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/schmitzm/schmitzm-jfree-2.6-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/lib/schmitzm/schmitzm-library-2.4-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: trunk/src/appl/data/DataLoader.java
===================================================================
--- trunk/src/appl/data/DataLoader.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/data/DataLoader.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,6 +2,8 @@
import java.io.Serializable;
+import de.appl.data.LoadingException;
+
/**
* A class that automatically loads a specified object and returns it, as soon
* as the {@link #load()} method is invoked. It is the counterpart of {@link DataUnloader}.
Modified: trunk/src/appl/data/FactoryLoader.java
===================================================================
--- trunk/src/appl/data/FactoryLoader.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/data/FactoryLoader.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,7 +1,7 @@
package appl.data;
-import schmitzm.data.WritableGrid;
-import appl.util.RasterMetaData;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
/**
Modified: trunk/src/appl/data/ImportFactoryLoader.java
===================================================================
--- trunk/src/appl/data/ImportFactoryLoader.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/data/ImportFactoryLoader.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,5 +1,6 @@
package appl.data;
+import de.appl.data.LoadingException;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.ImportFactory;
Modified: trunk/src/appl/data/LateLoadingProxy.java
===================================================================
--- trunk/src/appl/data/LateLoadingProxy.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/data/LateLoadingProxy.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -7,6 +7,7 @@
import org.apache.log4j.Logger;
import appl.util.GeneralUtil;
+import de.appl.data.LoadingException;
/**
* Loads an object on demand with the help of an <code>DataLoader</code>. The
Modified: trunk/src/appl/data/SerializedDataLoader.java
===================================================================
--- trunk/src/appl/data/SerializedDataLoader.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/data/SerializedDataLoader.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -9,6 +9,8 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import de.appl.data.LoadingException;
+
/**
* @author Dominik Appl
*/
Modified: trunk/src/appl/data/WritableGridArrayLoader.java
===================================================================
--- trunk/src/appl/data/WritableGridArrayLoader.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/data/WritableGridArrayLoader.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,8 +1,8 @@
package appl.data;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
-import appl.util.RasterMetaData;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGridArray;
/**
* Simply loads an empty {@link WritableGridArray} with the specified meta data.
Modified: trunk/src/appl/data/WritableGridLLProxy.java
===================================================================
--- trunk/src/appl/data/WritableGridLLProxy.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/data/WritableGridLLProxy.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,8 +2,9 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGrid;
-import appl.util.RasterMetaData;
+import de.appl.data.LoadingException;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/appl/parallel/client/ClientDataServer.java
===================================================================
--- trunk/src/appl/parallel/client/ClientDataServer.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/client/ClientDataServer.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,9 +15,9 @@
import org.apache.log4j.Logger;
import appl.ext.XuluConfig;
+import appl.parallel.event.CommEvent.CommType;
import appl.parallel.event.CommEventSink;
import appl.parallel.event.TransferEvent;
-import appl.parallel.event.CommEvent.CommType;
import appl.parallel.server.PartitionDataServer;
import appl.parallel.server.XuluServer;
import appl.parallel.spmd.split.DataPartition;
Modified: trunk/src/appl/parallel/client/RemoteExecutionController.java
===================================================================
--- trunk/src/appl/parallel/client/RemoteExecutionController.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/client/RemoteExecutionController.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -7,7 +7,6 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import schmitzm.lang.AbstractNamedObject;
import appl.ext.XuluConfig;
import appl.parallel.ComputingResourceContainer;
import appl.parallel.model.ParallelStepModel;
@@ -21,6 +20,7 @@
import com.sun.jini.tool.ClassServer;
+import de.schmitzm.lang.AbstractNamedObject;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluPlugin;
Modified: trunk/src/appl/parallel/data/AbstractDataHandler.java
===================================================================
--- trunk/src/appl/parallel/data/AbstractDataHandler.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/AbstractDataHandler.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -7,10 +7,10 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import appl.data.LoadingException;
import appl.parallel.client.ClientDataServer;
import appl.parallel.spmd.split.DataPartition;
import appl.parallel.spmd.split.SplittableResource;
+import de.appl.data.LoadingException;
/**
* This class is used as a base class for loaders. It is especially intended for
Modified: trunk/src/appl/parallel/data/PartitionDataHandler.java
===================================================================
--- trunk/src/appl/parallel/data/PartitionDataHandler.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/PartitionDataHandler.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,9 +2,9 @@
import java.awt.Rectangle;
-import appl.data.LoadingException;
import appl.parallel.client.ClientDataServer;
import appl.parallel.spmd.split.DataPartition;
+import de.appl.data.LoadingException;
/**
* Responsible for loading and unloading data partitions
Modified: trunk/src/appl/parallel/data/WritableGridArrayPartition.java
===================================================================
--- trunk/src/appl/parallel/data/WritableGridArrayPartition.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/WritableGridArrayPartition.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,13 +2,13 @@
import java.awt.Rectangle;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
import appl.data.DataProxy;
import appl.parallel.spmd.split.DataPartition;
import appl.parallel.spmd.split.WritableGridPartition;
import appl.parallel.util.PartitionUtil;
-import appl.util.RasterMetaData;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGridArray;
/**
* A WritableGridArrayPartition extends the {@link WritableGridArray} so that
Modified: trunk/src/appl/parallel/data/XuluClientLoader.java
===================================================================
--- trunk/src/appl/parallel/data/XuluClientLoader.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/XuluClientLoader.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -10,10 +10,10 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import appl.data.LoadingException;
import appl.parallel.client.ClientDataServer;
import appl.parallel.client.DataServer;
import appl.parallel.spmd.split.DataPartition;
+import de.appl.data.LoadingException;
/**
* Loads partitioned data from a {@link ClientDataServer}. And unloads the data
Modified: trunk/src/appl/parallel/data/splittable/GridListFactory.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/GridListFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/splittable/GridListFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,6 +1,6 @@
package appl.parallel.data.splittable;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.GridList;
Modified: trunk/src/appl/parallel/data/splittable/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/GridListFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/splittable/GridListFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,13 +2,12 @@
import java.io.File;
-import schmitzm.data.WritableGridArray;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.io.IOUtil;
import appl.data.DataProxy;
import appl.ext.XuluConfig;
import appl.util.RasterUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.io.IOUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/appl/parallel/data/splittable/MultiGridFactory.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/MultiGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/splittable/MultiGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,6 +1,6 @@
package appl.parallel.data.splittable;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/appl/parallel/data/splittable/MultiGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/MultiGridFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/splittable/MultiGridFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,9 +2,9 @@
import java.io.File;
-import schmitzm.data.WritableGrid;
import appl.ext.XuluConfig;
import appl.util.RasterUtil;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ImportFactory;
Modified: trunk/src/appl/parallel/data/splittable/SingleGridFactory.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/SingleGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/splittable/SingleGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,6 +1,6 @@
package appl.parallel.data.splittable;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
Modified: trunk/src/appl/parallel/data/splittable/SingleGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/SingleGridFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/splittable/SingleGridFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,7 +2,6 @@
import java.io.File;
-import schmitzm.data.WritableGridArray;
import appl.data.DataProxy;
import appl.ext.XuluConfig;
import appl.util.RasterUtil;
Modified: trunk/src/appl/parallel/data/splittable/SingleGridFactory_GeoTiff.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/SingleGridFactory_GeoTiff.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/splittable/SingleGridFactory_GeoTiff.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,7 +2,6 @@
import java.io.File;
-import schmitzm.data.WritableGridArray;
import appl.data.DataProxy;
import appl.data.WritableGridLLProxy;
import edu.bonn.xulu.appl.XuluRegistry;
Modified: trunk/src/appl/parallel/data/splittable/SplittableGridLLFactory.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/SplittableGridLLFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/splittable/SplittableGridLLFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,7 +2,7 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import appl.util.RasterMetaData;
+import de.appl.util.RasterMetaData;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/appl/parallel/data/splittable/SplittableLLProxyGrid.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/SplittableLLProxyGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/splittable/SplittableLLProxyGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -3,14 +3,14 @@
import java.awt.Rectangle;
import java.io.Serializable;
-import schmitzm.data.WritableGrid;
import appl.data.DataLoader;
import appl.data.WritableGridLLProxy;
import appl.parallel.spmd.split.DataPartition;
import appl.parallel.spmd.split.SplittableGrid;
import appl.parallel.spmd.split.WritableGridPartition;
import appl.parallel.util.PartitionUtil;
-import appl.util.RasterMetaData;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/appl/parallel/data/xulugridfile/GridFileDataLoader.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/GridFileDataLoader.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/xulugridfile/GridFileDataLoader.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,8 +1,8 @@
package appl.parallel.data.xulugridfile;
-import schmitzm.data.WritableGrid;
import appl.data.DataLoader;
-import appl.data.LoadingException;
+import de.appl.data.LoadingException;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* This {@link DataLoader} is responsible to load data from a
Modified: trunk/src/appl/parallel/data/xulugridfile/XuluGridFile.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/XuluGridFile.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/xulugridfile/XuluGridFile.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,12 +13,11 @@
import java.io.ObjectOutputStream;
import java.io.RandomAccessFile;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
import appl.parallel.data.WritableGridArrayPartition;
import appl.parallel.spmd.split.SplittableResource;
import appl.parallel.spmd.split.WritableGridPartition;
-import appl.util.RasterMetaData;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* A XuluGridfile is a memory- and 2D-access optimized file format
Modified: trunk/src/appl/parallel/data/xulugridfile/XuluGridFileConverter.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/XuluGridFileConverter.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/xulugridfile/XuluGridFileConverter.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -29,7 +29,7 @@
import java.io.Reader;
import java.io.StreamTokenizer;
-import appl.util.RasterMetaData;
+import de.appl.util.RasterMetaData;
/**
Modified: trunk/src/appl/parallel/data/xulugridfile/XuluGridSharedFileSystemLoader.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/XuluGridSharedFileSystemLoader.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/xulugridfile/XuluGridSharedFileSystemLoader.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -4,11 +4,11 @@
import java.io.File;
import java.rmi.RemoteException;
-import appl.data.LoadingException;
import appl.parallel.client.ClientDataServer;
import appl.parallel.data.AbstractDataHandler;
import appl.parallel.data.PartitionDataHandler;
import appl.parallel.spmd.split.DataPartition;
+import de.appl.data.LoadingException;
/**
* This is a loader for use with shared file systems like ocfs2 or gfs. It only
Modified: trunk/src/appl/parallel/data/xulugridfile/XuluWritableGridFile.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/XuluWritableGridFile.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/xulugridfile/XuluWritableGridFile.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -4,13 +4,13 @@
import java.io.File;
import java.io.FileNotFoundException;
-import schmitzm.data.WritableGrid;
import appl.data.DataLoader;
import appl.data.WritableGridLLProxy;
import appl.parallel.spmd.split.DataPartition;
import appl.parallel.spmd.split.SplittableGrid;
import appl.parallel.spmd.split.SplittableResource;
-import appl.util.RasterMetaData;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* An implementation of a WritableGrid based on a {@link XuluGridFile}.
Modified: trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,6 +1,6 @@
package appl.parallel.data.xulugridfile.factories;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.GridList;
Modified: trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -3,11 +3,6 @@
import java.io.File;
import java.io.FileOutputStream;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.io.IOUtil;
import appl.data.DataProxy;
import appl.data.WritableGridLLProxy;
import appl.ext.XuluConfig;
@@ -15,6 +10,10 @@
import appl.parallel.data.xulugridfile.XuluGridFileConverter;
import appl.parallel.data.xulugridfile.XuluWritableGridFile;
import appl.util.RasterUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.io.IOUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,6 +1,6 @@
package appl.parallel.data.xulugridfile.factories;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,13 +2,12 @@
import java.io.File;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
import appl.ext.XuluConfig;
import appl.parallel.data.xulugridfile.XuluGridFile;
import appl.parallel.data.xulugridfile.XuluGridFileConverter;
import appl.parallel.data.xulugridfile.XuluWritableGridFile;
import appl.util.RasterUtil;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ImportFactory;
Modified: trunk/src/appl/parallel/data/xulugridfile/factories/SingleGridFactory.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/SingleGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/SingleGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,6 +1,6 @@
package appl.parallel.data.xulugridfile.factories;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
Modified: trunk/src/appl/parallel/data/xulugridfile/factories/SingleGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/SingleGridFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/SingleGridFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -3,14 +3,13 @@
import java.io.File;
import java.io.FileOutputStream;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
import appl.data.DataProxy;
import appl.ext.XuluConfig;
import appl.parallel.data.xulugridfile.XuluGridFile;
import appl.parallel.data.xulugridfile.XuluGridFileConverter;
import appl.parallel.data.xulugridfile.XuluWritableGridFile;
import appl.util.RasterUtil;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/appl/parallel/data/xulugridfile/factories/XuluGridFactory.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/XuluGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/XuluGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -6,7 +6,7 @@
import appl.ext.XuluConfig;
import appl.parallel.data.xulugridfile.XuluGridFile;
import appl.parallel.data.xulugridfile.XuluWritableGridFile;
-import appl.util.RasterMetaData;
+import de.appl.util.RasterMetaData;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
/**
Modified: trunk/src/appl/parallel/gui/ModelControlFrame_parallel.java
===================================================================
--- trunk/src/appl/parallel/gui/ModelControlFrame_parallel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/gui/ModelControlFrame_parallel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -5,9 +5,9 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import schmitzm.lang.WorkingThread;
-import schmitzm.lang.WorkingThreadAdapter;
import appl.parallel.model.AbstractParallelStepModel;
+import de.schmitzm.lang.WorkingThread;
+import de.schmitzm.lang.WorkingThreadAdapter;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.model.XuluModel;
import edu.bonn.xulu.plugin.gui.ModelControlContainer;
Modified: trunk/src/appl/parallel/server/PartitionDataManager.java
===================================================================
--- trunk/src/appl/parallel/server/PartitionDataManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/server/PartitionDataManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -20,14 +20,13 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import appl.data.LoadingException;
import appl.parallel.client.ClientDataServer;
import appl.parallel.client.DataServer;
import appl.parallel.data.PartitionDataHandler;
+import appl.parallel.event.CommEvent.CommType;
import appl.parallel.event.CommEventSink;
import appl.parallel.event.TimeEvent;
import appl.parallel.event.TransferEvent;
-import appl.parallel.event.CommEvent.CommType;
import appl.parallel.services.RemoteEventProxy;
import appl.parallel.spmd.MultiDataInfo;
import appl.parallel.spmd.MultiDataPartitionObject;
@@ -37,6 +36,7 @@
import appl.parallel.spmd.split.SinglePartitionInfo;
import appl.parallel.spmd.split.SplitMap;
import appl.parallel.thread.DataServerThread;
+import de.appl.data.LoadingException;
/**
* Manages the all data for the {@link XuluServer}. This includes retrieval of
Modified: trunk/src/appl/parallel/server/XuluServer.java
===================================================================
--- trunk/src/appl/parallel/server/XuluServer.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/server/XuluServer.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -34,15 +34,15 @@
import appl.ext.XuluConfig;
import appl.parallel.ComputingResourceProperties;
import appl.parallel.client.ClientDataServer;
+import appl.parallel.event.CommEvent.CommType;
import appl.parallel.event.CommEventSink;
import appl.parallel.event.TimeEvent;
-import appl.parallel.event.CommEvent.CommType;
import appl.parallel.services.RemoteEventProxy;
import appl.parallel.spmd.AdvancedSPMDServerController;
import appl.parallel.spmd.SPMDTask;
+import appl.parallel.spmd.split.AbstractSplitMap.NeighborhoodBoxingMode;
import appl.parallel.spmd.split.SplitMap;
import appl.parallel.spmd.split.SplitMap1DVertical;
-import appl.parallel.spmd.split.AbstractSplitMap.NeighborhoodBoxingMode;
import appl.parallel.util.Helper;
import appl.util.benchmark.Benchmark;
Modified: trunk/src/appl/parallel/spmd/AbstractSPMDTask.java
===================================================================
--- trunk/src/appl/parallel/spmd/AbstractSPMDTask.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/spmd/AbstractSPMDTask.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,7 +2,7 @@
import java.awt.Rectangle;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* This class may be used as the superclass to all {@link SPMDTask SPMDTasks}
Modified: trunk/src/appl/parallel/spmd/MultiDataObject.java
===================================================================
--- trunk/src/appl/parallel/spmd/MultiDataObject.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/spmd/MultiDataObject.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -5,9 +5,9 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import schmitzm.data.WritableGrid;
import appl.parallel.client.DataServer;
import appl.parallel.spmd.split.DataPartition;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
/**
Modified: trunk/src/appl/parallel/spmd/SPMDClientController.java
===================================================================
--- trunk/src/appl/parallel/spmd/SPMDClientController.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/spmd/SPMDClientController.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -18,16 +18,16 @@
import appl.parallel.client.RemoteEventHandler;
import appl.parallel.data.PartitionDataHandler;
import appl.parallel.data.PartitionHandlerFactory;
+import appl.parallel.event.CommEvent.CommType;
import appl.parallel.event.CommEventSink;
-import appl.parallel.event.CommEvent.CommType;
import appl.parallel.model.AbstractParallelStepModel;
import appl.parallel.server.PartitionDataServer;
import appl.parallel.server.SPMDResource;
import appl.parallel.spmd.split.AbstractSplitMap;
+import appl.parallel.spmd.split.AbstractSplitMap.NeighborhoodBoxingMode;
import appl.parallel.spmd.split.SinglePartitionInfo;
import appl.parallel.spmd.split.SplitMap;
import appl.parallel.spmd.split.SplittableResource;
-import appl.parallel.spmd.split.AbstractSplitMap.NeighborhoodBoxingMode;
import appl.parallel.thread.ComputingResourceThread;
import appl.parallel.thread.DataServerThread;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
Modified: trunk/src/appl/parallel/spmd/SPMDClientInterface.java
===================================================================
--- trunk/src/appl/parallel/spmd/SPMDClientInterface.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/spmd/SPMDClientInterface.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,9 +2,9 @@
import appl.parallel.ComputingResource;
import appl.parallel.spmd.split.AbstractSplitMap;
+import appl.parallel.spmd.split.AbstractSplitMap.NeighborhoodBoxingMode;
import appl.parallel.spmd.split.SplitMap;
import appl.parallel.spmd.split.SplittableResource;
-import appl.parallel.spmd.split.AbstractSplitMap.NeighborhoodBoxingMode;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
/**
Modified: trunk/src/appl/parallel/spmd/SPMDTask.java
===================================================================
--- trunk/src/appl/parallel/spmd/SPMDTask.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/spmd/SPMDTask.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -3,8 +3,8 @@
import java.awt.Rectangle;
import java.io.Serializable;
-import schmitzm.data.WritableGrid;
import appl.parallel.server.XuluServer;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* A SPMDTask should be executed on servers using the SPMD-paradigm.
Modified: trunk/src/appl/parallel/spmd/split/SplitMap1DHorizontal.java
===================================================================
--- trunk/src/appl/parallel/spmd/split/SplitMap1DHorizontal.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/spmd/split/SplitMap1DHorizontal.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,7 +2,7 @@
import java.awt.Rectangle;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* Responsible for splitting a 2D Area (e.g a {@link WritableGrid}) in a
Modified: trunk/src/appl/parallel/spmd/split/SplitMap1DVertical.java
===================================================================
--- trunk/src/appl/parallel/spmd/split/SplitMap1DVertical.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/spmd/split/SplitMap1DVertical.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,7 +2,7 @@
import java.awt.Rectangle;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* Responsible for splitting a 2D Area (e.g a {@link WritableGrid}) in a
Modified: trunk/src/appl/parallel/spmd/split/SplitMap2D.java
===================================================================
--- trunk/src/appl/parallel/spmd/split/SplitMap2D.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/spmd/split/SplitMap2D.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -4,8 +4,8 @@
import java.awt.Rectangle;
import java.util.Vector;
-import schmitzm.data.WritableGrid;
import appl.parallel.util.Helper;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* Responsible for splitting a 2D Area (e.g a {@link WritableGrid}) in a 2D
Modified: trunk/src/appl/parallel/spmd/split/SplittableGrid.java
===================================================================
--- trunk/src/appl/parallel/spmd/split/SplittableGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/spmd/split/SplittableGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,6 +1,6 @@
package appl.parallel.spmd.split;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* A grid that is {@link SplittableResource splittable}
Modified: trunk/src/appl/parallel/spmd/split/WritableGridPartition.java
===================================================================
--- trunk/src/appl/parallel/spmd/split/WritableGridPartition.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/spmd/split/WritableGridPartition.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,6 +1,6 @@
package appl.parallel.spmd.split;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* A {@link DataPartition} that is splittable itself.
Modified: trunk/src/appl/parallel/starter/server/XuluServerStarter.java
===================================================================
--- trunk/src/appl/parallel/starter/server/XuluServerStarter.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/starter/server/XuluServerStarter.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -27,12 +27,12 @@
import javax.swing.JOptionPane;
-import schmitzm.swing.TextAreaPrintStream;
import appl.ext.XuluConfig;
import appl.parallel.ComputingResource;
import appl.parallel.server.XuluServer;
import appl.parallel.starter.Starter;
import appl.parallel.util.Helper;
+import de.schmitzm.swing.TextAreaPrintStream;
/**
* A running instance of the XuluServerStarter waits for a signal to start a
Modified: trunk/src/appl/parallel/starter/server/XuluStarterServerGUI.java
===================================================================
--- trunk/src/appl/parallel/starter/server/XuluStarterServerGUI.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/starter/server/XuluStarterServerGUI.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -14,7 +14,7 @@
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
-import schmitzm.swing.event.PopupMenuListener;
+import de.schmitzm.swing.event.PopupMenuListener;
/**
* This is the GUI for the {@link XuluServerStarter}
Modified: trunk/src/appl/parallel/test/AverageNeighborhoodTestTask.java
===================================================================
--- trunk/src/appl/parallel/test/AverageNeighborhoodTestTask.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/test/AverageNeighborhoodTestTask.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,10 +2,10 @@
import java.awt.Rectangle;
-import schmitzm.data.WritableGrid;
import appl.parallel.spmd.AbstractSPMDTask;
import appl.parallel.spmd.SPMDServerInterface;
import appl.util.RasterUtil;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* @author Dominik Appl
Modified: trunk/src/appl/parallel/test/AverageNeighborhoodTestTask_MultiGrid.java
===================================================================
--- trunk/src/appl/parallel/test/AverageNeighborhoodTestTask_MultiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/test/AverageNeighborhoodTestTask_MultiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,11 +2,11 @@
import java.awt.Rectangle;
-import schmitzm.data.WritableGrid;
import appl.parallel.spmd.AbstractSPMDTask;
import appl.parallel.spmd.SPMDServerInterface;
import appl.parallel.spmd.split.DataPartition;
import appl.util.RasterUtil;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* @author Dominik Appl
Modified: trunk/src/appl/parallel/test/PartitialGridTest.java
===================================================================
--- trunk/src/appl/parallel/test/PartitialGridTest.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/test/PartitialGridTest.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -5,12 +5,12 @@
import java.io.File;
import java.io.FileNotFoundException;
-import schmitzm.data.WritableGridRaster;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
import appl.parallel.spmd.split.WritableGridPartition;
import appl.parallel.util.PartitionUtil;
import appl.util.RasterUtil;
+import de.schmitzm.geotools.data.WritableGridRaster;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
/**
* Simple JUnit Test
Modified: trunk/src/appl/parallel/test/SPMDTest.java
===================================================================
--- trunk/src/appl/parallel/test/SPMDTest.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/test/SPMDTest.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,8 +13,6 @@
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
-import schmitzm.data.WritableGridRaster;
-import schmitzm.geotools.io.GeoImportUtil;
import appl.parallel.ComputingResourceContainer;
import appl.parallel.client.ClientDataServer;
import appl.parallel.client.RemoteEventHandler;
@@ -22,8 +20,10 @@
import appl.parallel.services.GlobalDiscoveryService;
import appl.parallel.spmd.SPMDClientController;
import appl.parallel.spmd.split.SplittableGrid;
-import appl.util.RasterMetaData;
import appl.util.RasterUtil;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGridRaster;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
/**
Modified: trunk/src/appl/parallel/test/SPMDTest_MultiGrid.java
===================================================================
--- trunk/src/appl/parallel/test/SPMDTest_MultiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/test/SPMDTest_MultiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,9 +13,6 @@
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridRaster;
-import schmitzm.geotools.io.GeoImportUtil;
import appl.parallel.ComputingResourceContainer;
import appl.parallel.client.ClientDataServer;
import appl.parallel.client.RemoteEventHandler;
@@ -23,8 +20,11 @@
import appl.parallel.services.GlobalDiscoveryService;
import appl.parallel.spmd.SPMDClientController;
import appl.parallel.spmd.split.SplittableGrid;
-import appl.util.RasterMetaData;
import appl.util.RasterUtil;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGridRaster;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
/**
Modified: trunk/src/appl/parallel/test/SplitMapTest.java
===================================================================
--- trunk/src/appl/parallel/test/SplitMapTest.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/test/SplitMapTest.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -6,16 +6,16 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import schmitzm.data.WritableGrid;
-import schmitzm.geotools.io.GeoImportUtil;
import appl.parallel.data.splittable.SplittableLLProxyGrid;
import appl.parallel.spmd.split.AbstractSplitMap;
import appl.parallel.spmd.split.SplitMap;
import appl.parallel.spmd.split.SplitMap1DHorizontal;
import appl.parallel.spmd.split.SplitMap1DVertical;
import appl.parallel.spmd.split.SplitMap2D;
-import appl.util.RasterMetaData;
import appl.util.RasterUtil;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.io.GeoImportUtil;
/**
* Generated code for the test suite <b>SplitMapTest</b> located at
Modified: trunk/src/appl/parallel/test/XuluGridTestCase.java
===================================================================
--- trunk/src/appl/parallel/test/XuluGridTestCase.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/test/XuluGridTestCase.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -8,15 +8,15 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
-import schmitzm.data.WritableGridRaster;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
import appl.parallel.data.xulugridfile.XuluGridFile;
import appl.parallel.spmd.split.WritableGridPartition;
-import appl.util.RasterMetaData;
import appl.util.RasterUtil;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGridArray;
+import de.schmitzm.geotools.data.WritableGridRaster;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_ArcInfoAsciiGrid;
/**
Modified: trunk/src/appl/parallel/thread/ComputingResourceThread.java
===================================================================
--- trunk/src/appl/parallel/thread/ComputingResourceThread.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/thread/ComputingResourceThread.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,8 +2,8 @@
import appl.parallel.ComputingResource;
import appl.parallel.ComputingResourceProperties;
+import appl.parallel.event.CommEvent.CommType;
import appl.parallel.event.CommEventSink;
-import appl.parallel.event.CommEvent.CommType;
/**
* @author Dominik Appl
Modified: trunk/src/appl/parallel/thread/DataServerThread.java
===================================================================
--- trunk/src/appl/parallel/thread/DataServerThread.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/thread/DataServerThread.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,8 +1,8 @@
package appl.parallel.thread;
import appl.parallel.ComputingResourceProperties;
+import appl.parallel.event.CommEvent.CommType;
import appl.parallel.event.CommEventSink;
-import appl.parallel.event.CommEvent.CommType;
import appl.parallel.server.PartitionDataServer;
/**
Modified: trunk/src/appl/parallel/thread/ExecutionThread.java
===================================================================
--- trunk/src/appl/parallel/thread/ExecutionThread.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/thread/ExecutionThread.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -5,10 +5,10 @@
import appl.parallel.ComputingResourceProperties;
import appl.parallel.event.CommEvent;
+import appl.parallel.event.CommEvent.CommType;
import appl.parallel.event.CommEventSink;
import appl.parallel.event.TimeEvent;
import appl.parallel.event.TransferEvent;
-import appl.parallel.event.CommEvent.CommType;
/**
* A simple helper class for more easy Thread handling with anonymous classes.
Modified: trunk/src/appl/parallel/util/PartitionUtil.java
===================================================================
--- trunk/src/appl/parallel/util/PartitionUtil.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/parallel/util/PartitionUtil.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -3,12 +3,11 @@
import java.awt.Rectangle;
import java.awt.image.DataBuffer;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
import appl.parallel.data.WritableGridArrayPartition;
import appl.parallel.spmd.split.SplittableResource;
import appl.parallel.spmd.split.WritableGridPartition;
-import appl.util.RasterMetaData;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* See method description for details.
Modified: trunk/src/appl/plugin/multimodelcontrol/MultiModelControlHandler.java
===================================================================
--- trunk/src/appl/plugin/multimodelcontrol/MultiModelControlHandler.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/plugin/multimodelcontrol/MultiModelControlHandler.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,12 +13,12 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.lang.WorkingThread;
-import schmitzm.lang.WorkingThreadAdapter;
-import schmitzm.swing.TextAreaPrintStream;
import appl.parallel.gui.ParallelControlPanelEngine;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.lang.WorkingThread;
+import de.schmitzm.lang.WorkingThreadAdapter;
+import de.schmitzm.swing.TextAreaPrintStream;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.ModelControlManager;
import edu.bonn.xulu.gui.ModelControlFrame;
Modified: trunk/src/appl/util/RasterUtil.java
===================================================================
--- trunk/src/appl/util/RasterUtil.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/util/RasterUtil.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,8 +11,9 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGrid;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.appl.util.RasterMetaData;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.io.GeoImportUtil;
/**
* This Class provides some simple mostly independent functions
Modified: trunk/src/appl/util/benchmark/SimpleBenchmark.java
===================================================================
--- trunk/src/appl/util/benchmark/SimpleBenchmark.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/appl/util/benchmark/SimpleBenchmark.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -4,10 +4,10 @@
import java.awt.image.DataBuffer;
import java.util.Random;
-import appl.data.LoadingException;
import appl.ext.XuluConfig;
import appl.parallel.data.splittable.SplittableLLProxyGrid;
-import appl.util.RasterMetaData;
+import de.appl.data.LoadingException;
+import de.appl.util.RasterMetaData;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
/**
Modified: trunk/src/de/skrueger/xulu/plugin/gnur/GnuRGUI.java
===================================================================
--- trunk/src/de/skrueger/xulu/plugin/gnur/GnuRGUI.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/de/skrueger/xulu/plugin/gnur/GnuRGUI.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -43,13 +43,13 @@
import org.rosuda.JRI.RVector;
import org.rosuda.JRI.Rengine;
-import schmitzm.data.RasterCalculator;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.Property;
-import schmitzm.swing.ManualInputOption;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.geotools.data.RasterCalculator;
+import de.schmitzm.swing.input.ManualInputOption;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.gui.XuluInternalFrame;
Modified: trunk/src/de/skrueger/xulu/plugin/gnur/PropertytypeNotConvertableToRVar.java
===================================================================
--- trunk/src/de/skrueger/xulu/plugin/gnur/PropertytypeNotConvertableToRVar.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/de/skrueger/xulu/plugin/gnur/PropertytypeNotConvertableToRVar.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,9 +11,10 @@
**/
package de.skrueger.xulu.plugin.gnur;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.PropertyException;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.PropertyException;
+
/**
* This Exception is thrown, when the object from the datapool is not convertable to an R object. This can be
* due to the structure of the data, or due to the GnuR plugins capabilities.
Modified: trunk/src/de/skrueger/xulu/plugin/gnur/RVar.java
===================================================================
--- trunk/src/de/skrueger/xulu/plugin/gnur/RVar.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/de/skrueger/xulu/plugin/gnur/RVar.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -3,8 +3,8 @@
import org.rosuda.JRI.REXP;
import org.rosuda.JRI.Rengine;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ValueProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ValueProperty;
/**
* Link between datapool and R-Engine
Modified: trunk/src/de/skrueger/xulu/plugin/gnur/RVarAdapter.java
===================================================================
--- trunk/src/de/skrueger/xulu/plugin/gnur/RVarAdapter.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/de/skrueger/xulu/plugin/gnur/RVarAdapter.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,9 +2,9 @@
import org.rosuda.JRI.Rengine;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.ScalarProperty;
/**
* Link between datapool and R-Engine
Modified: trunk/src/de/skrueger/xulu/plugin/gnur/RVarMatrix.java
===================================================================
--- trunk/src/de/skrueger/xulu/plugin/gnur/RVarMatrix.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/de/skrueger/xulu/plugin/gnur/RVarMatrix.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -3,7 +3,7 @@
import org.rosuda.JRI.REXP;
import org.rosuda.JRI.Rengine;
-import schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.MatrixProperty;
public class RVarMatrix extends RVarAdapter {
Modified: trunk/src/de/skrueger/xulu/plugin/gnur/RVarScalar.java
===================================================================
--- trunk/src/de/skrueger/xulu/plugin/gnur/RVarScalar.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/de/skrueger/xulu/plugin/gnur/RVarScalar.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -3,7 +3,7 @@
import org.rosuda.JRI.REXP;
import org.rosuda.JRI.Rengine;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
public class RVarScalar extends RVarAdapter{
Modified: trunk/src/de/skrueger/xulu/plugin/gnur/RVarSingleGrid.java
===================================================================
--- trunk/src/de/skrueger/xulu/plugin/gnur/RVarSingleGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/de/skrueger/xulu/plugin/gnur/RVarSingleGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,7 +2,7 @@
import org.rosuda.JRI.Rengine;
-import schmitzm.data.property.Property;
+import de.schmitzm.data.property.Property;
public class RVarSingleGrid extends RVarAdapter {
Modified: trunk/src/de/skrueger/xulu/plugin/gnur/RVarsTable.java
===================================================================
--- trunk/src/de/skrueger/xulu/plugin/gnur/RVarsTable.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/de/skrueger/xulu/plugin/gnur/RVarsTable.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,7 +1,7 @@
package de.skrueger.xulu.plugin.gnur;
-import schmitzm.swing.table.MutableTable;
-import schmitzm.swing.table.MutableTableModel;
+import de.schmitzm.swing.table.MutableTable;
+import de.schmitzm.swing.table.MutableTableModel;
public class RVarsTable extends MutableTable {
Modified: trunk/src/de/skrueger/xulu/plugin/gnur/RVarsTableModel.java
===================================================================
--- trunk/src/de/skrueger/xulu/plugin/gnur/RVarsTableModel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/de/skrueger/xulu/plugin/gnur/RVarsTableModel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,10 +2,10 @@
import java.util.Vector;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.swing.SelectionInputOption;
-import schmitzm.swing.table.AbstractMutableTableModel;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.swing.input.SelectionInputOption;
+import de.schmitzm.swing.table.AbstractMutableTableModel;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.DataPool;
Modified: trunk/src/edu/bonn/xulu/XuluModellingPlatform.java
===================================================================
--- trunk/src/edu/bonn/xulu/XuluModellingPlatform.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/XuluModellingPlatform.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -20,16 +20,13 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.geotools.GTUtil;
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.ResourceProvider;
-import schmitzm.lang.SortableVector;
-import schmitzm.mail.MailUtil;
-import schmitzm.swing.ExceptionDialog;
-import schmitzm.swing.SwingUtil;
-import schmitzm.swing.SwingWorker;
import appl.ext.XuluConfig;
+import de.schmitzm.geotools.GTUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.lang.ResourceProvider;
+import de.schmitzm.swing.ExceptionDialog;
+import de.schmitzm.swing.SwingUtil;
+import de.schmitzm.swing.SwingWorker;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.appl.EventManager;
import edu.bonn.xulu.appl.ModelControlManager;
@@ -92,12 +89,12 @@
static {
// Resource Bundles aus Standard-Paketen umlenken
- schmitzm.swing.SwingUtil.RESOURCE.resetResourceBundle(XuluConstants.EXTENTION_BUNDLE,"schmitzm.swing");
- schmitzm.geotools.gui.GeotoolsGUIUtil.RESOURCE.resetResourceBundle(XuluConstants.EXTENTION_BUNDLE,"schmitzm.gt");
- schmitzm.geotools.feature.FeatureUtil.RESOURCE.resetResourceBundle(XuluConstants.EXTENTION_BUNDLE,"schmitzm.gt.feature");
- schmitzm.jfree.JFreeChartUtil.RESOURCE.resetResourceBundle(XuluConstants.EXTENTION_BUNDLE,"schmitzm.jfree");
- schmitzm.data.DataUtil.RESOURCE.resetResourceBundle(XuluConstants.EXTENTION_BUNDLE,"schmitzm.data");
- schmitzm.lang.LangUtil.RESOURCE.resetResourceBundle(XuluConstants.EXTENTION_BUNDLE,"schmitzm.lang");
+ de.schmitzm.swing.SwingUtil.RESOURCE.resetResourceBundle(XuluConstants.EXTENTION_BUNDLE,"schmitzm.swing");
+ de.schmitzm.geotools.gui.GeotoolsGUIUtil.RESOURCE.resetResourceBundle(XuluConstants.EXTENTION_BUNDLE,"schmitzm.gt");
+ de.schmitzm.geotools.feature.FeatureUtil.RESOURCE.resetResourceBundle(XuluConstants.EXTENTION_BUNDLE,"schmitzm.gt.feature");
+ de.schmitzm.jfree.JFreeChartUtil.RESOURCE.resetResourceBundle(XuluConstants.EXTENTION_BUNDLE,"schmitzm.jfree");
+ de.schmitzm.data.DataUtil.RESOURCE.resetResourceBundle(XuluConstants.EXTENTION_BUNDLE,"schmitzm.data");
+ de.schmitzm.lang.LangUtil.RESOURCE.resetResourceBundle(XuluConstants.EXTENTION_BUNDLE,"schmitzm.lang");
ExceptionDialog.setMailDestinationAddress( XuluConstants.BUG_MAIL_ADDR );
}
Modified: trunk/src/edu/bonn/xulu/appl/AbstractCommandInterpreter.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/AbstractCommandInterpreter.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/AbstractCommandInterpreter.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,7 +13,7 @@
import java.io.InputStream;
-import schmitzm.lang.OperationCanceledException;
+import de.schmitzm.lang.OperationCanceledException;
import edu.bonn.xulu.XuluModellingPlatform;
/**
Modified: trunk/src/edu/bonn/xulu/appl/AbstractManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/AbstractManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/AbstractManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,11 +13,11 @@
import java.util.Vector;
-import schmitzm.data.event.AbstractObjectTraceable;
-import schmitzm.data.event.Invoker;
-import schmitzm.data.event.ObjectChangeEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.lang.DuplicateException;
+import de.schmitzm.data.event.AbstractObjectTraceable;
+import de.schmitzm.data.event.Invoker;
+import de.schmitzm.data.event.ObjectChangeEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.lang.DuplicateException;
/**
* Diese Klasse stellt einen allgemeinen Manager dar. Dieser dient dazu,
Modified: trunk/src/edu/bonn/xulu/appl/AbstractXuluPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/AbstractXuluPlugin.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/AbstractXuluPlugin.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.appl;
-import schmitzm.lang.AbstractNamedObject;
+import de.schmitzm.lang.AbstractNamedObject;
import edu.bonn.xulu.XuluModellingPlatform;
/**
Modified: trunk/src/edu/bonn/xulu/appl/DataPool.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/DataPool.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/DataPool.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,12 +16,12 @@
import java.util.Random;
import java.util.Vector;
-import schmitzm.data.event.AbstractObjectEvent;
-import schmitzm.data.event.AbstractObjectTraceable;
-import schmitzm.data.event.Invoker;
-import schmitzm.data.event.NameChangeEvent;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
+import de.schmitzm.data.event.AbstractObjectEvent;
+import de.schmitzm.data.event.AbstractObjectTraceable;
+import de.schmitzm.data.event.Invoker;
+import de.schmitzm.data.event.NameChangeEvent;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
import edu.bonn.xulu.data.DuplicateXuluObjectIDException;
import edu.bonn.xulu.data.DuplicateXuluObjectNameException;
import edu.bonn.xulu.data.XuluObject;
Modified: trunk/src/edu/bonn/xulu/appl/EventHandler.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/EventHandler.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/EventHandler.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.appl;
-import schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectEvent;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.model.XuluModel;
Modified: trunk/src/edu/bonn/xulu/appl/EventManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/EventManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/EventManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -14,14 +14,14 @@
import java.util.Enumeration;
import java.util.Vector;
-import schmitzm.data.event.GeneralObjectChangeEvent;
-import schmitzm.data.event.NameChangeEvent;
-import schmitzm.data.event.ObjectChangeEvent;
-import schmitzm.data.event.ObjectCloseEvent;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectTraceable;
-import schmitzm.lang.HashtableWithCollisionList;
+import de.schmitzm.data.event.GeneralObjectChangeEvent;
+import de.schmitzm.data.event.NameChangeEvent;
+import de.schmitzm.data.event.ObjectChangeEvent;
+import de.schmitzm.data.event.ObjectCloseEvent;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.data.event.ObjectTraceable;
+import de.schmitzm.lang.HashtableWithCollisionList;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.gui.ModelControlFrame;
import edu.bonn.xulu.model.XuluModel;
Modified: trunk/src/edu/bonn/xulu/appl/Handler.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/Handler.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/Handler.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.appl;
-import schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectEvent;
/**
* Ein Handler beschreibt eine konkrete Reaktion auf ein Ereignis. Diese ist jedoch
Modified: trunk/src/edu/bonn/xulu/appl/ModelControlManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/ModelControlManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/ModelControlManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,8 +13,8 @@
import java.util.Vector;
-import schmitzm.data.event.AbstractObjectTraceable;
-import schmitzm.data.event.ObjectListener;
+import de.schmitzm.data.event.AbstractObjectTraceable;
+import de.schmitzm.data.event.ObjectListener;
import edu.bonn.xulu.gui.ModelControlFrame;
/**
Modified: trunk/src/edu/bonn/xulu/appl/RecentImports.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/RecentImports.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/RecentImports.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,8 +15,8 @@
import org.apache.log4j.Logger;
-import schmitzm.lang.LimitedVector;
import appl.ext.XuluConfig;
+import de.schmitzm.lang.LimitedVector;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.io.IODefinition;
import edu.bonn.xulu.io.ImportFactory;
Modified: trunk/src/edu/bonn/xulu/appl/RecentScripts.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/RecentScripts.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/RecentScripts.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,8 +15,8 @@
import org.apache.log4j.Logger;
-import schmitzm.lang.LimitedVector;
import appl.ext.XuluConfig;
+import de.schmitzm.lang.LimitedVector;
import edu.bonn.xulu.XuluModellingPlatform;
Modified: trunk/src/edu/bonn/xulu/appl/ScriptInterpreter.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/ScriptInterpreter.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/ScriptInterpreter.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,8 +15,8 @@
import java.io.FileInputStream;
import java.io.InputStream;
-import schmitzm.lang.AbstractNamedObject;
-import schmitzm.lang.NamedObject;
+import de.schmitzm.lang.AbstractNamedObject;
+import de.schmitzm.lang.NamedObject;
import edu.bonn.xulu.XuluModellingPlatform;
/**
Modified: trunk/src/edu/bonn/xulu/appl/VisualisationManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/VisualisationManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/VisualisationManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,7 +13,7 @@
import java.util.Vector;
-import schmitzm.data.event.ObjectListener;
+import de.schmitzm.data.event.ObjectListener;
/**
* Der VisualisationManager verwaltet saemtliche in der Xulu-Applikation
Modified: trunk/src/edu/bonn/xulu/appl/XuluConstants.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/XuluConstants.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/XuluConstants.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,8 +16,8 @@
import javax.swing.ImageIcon;
-import schmitzm.lang.ResourceProvider;
-import schmitzm.swing.SwingUtil;
+import de.schmitzm.lang.ResourceProvider;
+import de.schmitzm.swing.SwingUtil;
import edu.bonn.xulu.XuluModellingPlatform;
// nur fuer Doku
@@ -32,9 +32,9 @@
public static final String BUG_MAIL_ADDR = "xulu-bugs at mojays.de";
/** Versionsnummer der Xulu-Modelling-Platform. **/
- public static final String VERSION = "1.9.1";
+ public static final String VERSION = "1.9.3";
/** Versionsdatum der Xulu-Modelling-Platform. **/
- public static final String VERSION_DATE = "2011-01-27";
+ public static final String VERSION_DATE = "2011-07-11";
/** Verzeichnis, in dem Icons und Uebersetzungen hinterlegt sind. */
public static final String RESOURCE_DIR = "resource";
/** Verzeichnis, in dem Icons hinterlegt sind. */
Modified: trunk/src/edu/bonn/xulu/appl/XuluPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/XuluPlugin.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/XuluPlugin.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.appl;
-import schmitzm.lang.NamedObject;
+import de.schmitzm.lang.NamedObject;
import edu.bonn.xulu.XuluModellingPlatform;
/**
Modified: trunk/src/edu/bonn/xulu/appl/XuluRegistry.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/XuluRegistry.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/appl/XuluRegistry.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -14,13 +14,13 @@
import java.util.Hashtable;
import java.util.Vector;
-import schmitzm.data.event.AbstractObjectTraceable;
-import schmitzm.data.event.Invoker;
-import schmitzm.data.event.ObjectChangeEvent;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.lang.LimitedVector;
-import schmitzm.lang.NamedObject;
+import de.schmitzm.data.event.AbstractObjectTraceable;
+import de.schmitzm.data.event.Invoker;
+import de.schmitzm.data.event.ObjectChangeEvent;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.lang.LimitedVector;
+import de.schmitzm.lang.NamedObject;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
Modified: trunk/src/edu/bonn/xulu/data/AbstractXuluObject.java
===================================================================
--- trunk/src/edu/bonn/xulu/data/AbstractXuluObject.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/data/AbstractXuluObject.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,19 +13,19 @@
import java.util.Enumeration;
-import schmitzm.data.ObjectStructure;
-import schmitzm.data.event.AbstractObjectTraceable;
-import schmitzm.data.event.Invoker;
-import schmitzm.data.event.NameChangeEvent;
-import schmitzm.data.event.ObjectChangeEvent;
-import schmitzm.data.event.ObjectCloseEvent;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.PropertySet;
-import schmitzm.data.property.PropertyType;
-import schmitzm.data.property.ValuePropertyType;
+import de.schmitzm.data.ObjectStructure;
+import de.schmitzm.data.event.AbstractObjectTraceable;
+import de.schmitzm.data.event.Invoker;
+import de.schmitzm.data.event.NameChangeEvent;
+import de.schmitzm.data.event.ObjectChangeEvent;
+import de.schmitzm.data.event.ObjectCloseEvent;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.data.property.Properties;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.PropertySet;
+import de.schmitzm.data.property.PropertyType;
+import de.schmitzm.data.property.ValuePropertyType;
import edu.bonn.xulu.appl.DataPool;
Modified: trunk/src/edu/bonn/xulu/data/DynamicXuluObject.java
===================================================================
--- trunk/src/edu/bonn/xulu/data/DynamicXuluObject.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/data/DynamicXuluObject.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,9 +11,9 @@
package edu.bonn.xulu.data;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.PropertySet;
+import de.schmitzm.data.property.Properties;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.PropertySet;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.InstantiationFactory;
Modified: trunk/src/edu/bonn/xulu/data/XuluObject.java
===================================================================
--- trunk/src/edu/bonn/xulu/data/XuluObject.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/data/XuluObject.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,9 +11,9 @@
package edu.bonn.xulu.data;
-import schmitzm.data.event.ObjectTraceable;
-import schmitzm.data.property.Properties;
-import schmitzm.lang.NamedObject;
+import de.schmitzm.data.event.ObjectTraceable;
+import de.schmitzm.data.property.Properties;
+import de.schmitzm.lang.NamedObject;
import edu.bonn.xulu.appl.XuluComponent;
/**
Modified: trunk/src/edu/bonn/xulu/gui/DataPoolInputOption.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/DataPoolInputOption.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/gui/DataPoolInputOption.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,10 +11,10 @@
package edu.bonn.xulu.gui;
-import schmitzm.data.property.Property;
-import schmitzm.swing.BrowseInputOption;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.TreeSelectionDialog;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.swing.TreeSelectionDialog;
+import de.schmitzm.swing.input.BrowseInputOption;
+import de.schmitzm.swing.input.MultipleOptionPane;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.appl.XuluConstants;
import edu.bonn.xulu.data.XuluObject;
Modified: trunk/src/edu/bonn/xulu/gui/DataPoolMenu.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/DataPoolMenu.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/gui/DataPoolMenu.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,16 +16,16 @@
import java.io.File;
import java.util.Vector;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.property.AccessViolationException;
-import schmitzm.data.property.Property;
-import schmitzm.lang.AlreadyHandledException;
-import schmitzm.lang.NamedObject;
-import schmitzm.swing.SwingWorker;
-import schmitzm.swing.menu.ActionStructure;
-import schmitzm.swing.menu.ObjectMenuItem;
-import schmitzm.swing.menu.ObjectSubMenu;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.data.property.AccessViolationException;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.lang.AlreadyHandledException;
+import de.schmitzm.lang.NamedObject;
+import de.schmitzm.swing.SwingWorker;
+import de.schmitzm.swing.menu.ActionStructure;
+import de.schmitzm.swing.menu.ObjectMenuItem;
+import de.schmitzm.swing.menu.ObjectSubMenu;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.VisualisationManager;
import edu.bonn.xulu.appl.VisualisationTool;
Modified: trunk/src/edu/bonn/xulu/gui/DataPoolTreeModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/DataPoolTreeModel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/gui/DataPoolTreeModel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -17,16 +17,16 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.swing.tree.ContentNode;
-import schmitzm.swing.tree.EmptyNode;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.Properties;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.swing.tree.ContentNode;
+import de.schmitzm.swing.tree.EmptyNode;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.data.XuluObject;
Modified: trunk/src/edu/bonn/xulu/gui/ModelContentManagerContainer.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/ModelContentManagerContainer.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/gui/ModelContentManagerContainer.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -17,10 +17,10 @@
import javax.swing.SpringLayout;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.swing.SelectionInputOption;
-import schmitzm.swing.SpringUtilities;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.swing.SpringUtilities;
+import de.schmitzm.swing.input.SelectionInputOption;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.model.ModelContentManager;
import edu.bonn.xulu.model.ModelResource;
Modified: trunk/src/edu/bonn/xulu/gui/ModelManagerTreeModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/ModelManagerTreeModel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/gui/ModelManagerTreeModel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,9 +13,9 @@
import javax.swing.tree.DefaultTreeModel;
-import schmitzm.swing.TreeSelectionDialog;
-import schmitzm.swing.tree.ContentNode;
-import schmitzm.swing.tree.EmptyNode;
+import de.schmitzm.swing.TreeSelectionDialog;
+import de.schmitzm.swing.tree.ContentNode;
+import de.schmitzm.swing.tree.EmptyNode;
import edu.bonn.xulu.appl.ModelControlManager;
import edu.bonn.xulu.model.XuluModel;
Modified: trunk/src/edu/bonn/xulu/gui/ObjectOrModelInputOption.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/ObjectOrModelInputOption.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/gui/ObjectOrModelInputOption.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -14,9 +14,9 @@
import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.MutableTreeNode;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.TreeSelectionDialog;
-import schmitzm.swing.tree.EmptyNode;
+import de.schmitzm.swing.TreeSelectionDialog;
+import de.schmitzm.swing.input.MultipleOptionPane;
+import de.schmitzm.swing.tree.EmptyNode;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.appl.ModelControlManager;
Modified: trunk/src/edu/bonn/xulu/gui/XuluGUIMessages.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluGUIMessages.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/gui/XuluGUIMessages.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -12,17 +12,14 @@
package edu.bonn.xulu.gui;
import java.awt.Component;
-import java.io.File;
import javax.swing.JOptionPane;
-import schmitzm.data.property.AccessViolationException;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.lang.LangUtil;
-import schmitzm.swing.ExceptionDialog;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.SwingUtil;
+import de.schmitzm.data.property.AccessViolationException;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.swing.ExceptionDialog;
import edu.bonn.xulu.appl.XuluConstants;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.data.XuluObject;
Modified: trunk/src/edu/bonn/xulu/gui/XuluGUIUtil.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluGUIUtil.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/gui/XuluGUIUtil.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -24,24 +24,24 @@
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.io.IOUtil;
-import schmitzm.lang.AlreadyHandledException;
-import schmitzm.lang.DuplicateException;
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.OperationCanceledException;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.ManualInputOption;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.SelectionInputOption;
-import schmitzm.swing.StatusDialog;
-import schmitzm.swing.SwingUtil;
-import schmitzm.swing.SwingWorker;
import appl.parallel.gui.ModelControlFrame_parallel;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.Properties;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.io.IOUtil;
+import de.schmitzm.lang.AlreadyHandledException;
+import de.schmitzm.lang.DuplicateException;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.lang.OperationCanceledException;
+import de.schmitzm.swing.StatusDialog;
+import de.schmitzm.swing.SwingUtil;
+import de.schmitzm.swing.SwingWorker;
+import de.schmitzm.swing.input.InputOption;
+import de.schmitzm.swing.input.ManualInputOption;
+import de.schmitzm.swing.input.MultipleOptionPane;
+import de.schmitzm.swing.input.SelectionInputOption;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.appl.ScriptInterpreter;
Modified: trunk/src/edu/bonn/xulu/gui/XuluLanguageManagerFrame.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluLanguageManagerFrame.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/gui/XuluLanguageManagerFrame.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -14,7 +14,7 @@
import java.awt.Frame;
import java.io.File;
-import schmitzm.swing.ResourceProviderManagerFrame;
+import de.schmitzm.swing.ResourceProviderManagerFrame;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluComponent;
import edu.bonn.xulu.appl.XuluConstants;
Modified: trunk/src/edu/bonn/xulu/gui/XuluMainFrame.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluMainFrame.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/gui/XuluMainFrame.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -35,12 +35,12 @@
import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.swing.ExceptionDialog;
-import schmitzm.swing.SwingUtil;
-import schmitzm.swing.menu.ObjectMenuItem;
import appl.ext.XuluConfig;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.swing.ExceptionDialog;
+import de.schmitzm.swing.SwingUtil;
+import de.schmitzm.swing.menu.ObjectMenuItem;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.appl.EventManager;
Modified: trunk/src/edu/bonn/xulu/gui/XuluMainFrameInfo.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluMainFrameInfo.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/gui/XuluMainFrameInfo.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -36,7 +36,7 @@
import javax.swing.text.StyleContext;
import javax.swing.text.StyledDocument;
-import schmitzm.swing.ExceptionDialog;
+import de.schmitzm.swing.ExceptionDialog;
import edu.bonn.xulu.appl.XuluComponent;
/**
Modified: trunk/src/edu/bonn/xulu/gui/XuluStartingFrame.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluStartingFrame.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/gui/XuluStartingFrame.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -19,8 +19,8 @@
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
-import schmitzm.swing.StatusDialog;
-import schmitzm.swing.TextAreaPrintStream;
+import de.schmitzm.swing.StatusDialog;
+import de.schmitzm.swing.TextAreaPrintStream;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluConstants;
Modified: trunk/src/edu/bonn/xulu/io/Factory.java
===================================================================
--- trunk/src/edu/bonn/xulu/io/Factory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/io/Factory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.io;
-import schmitzm.lang.NamedObject;
+import de.schmitzm.lang.NamedObject;
/**
* Dieses Interface bildet den Obertyp fuer jegliche Art von Factory.
Modified: trunk/src/edu/bonn/xulu/model/AbstractModelContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/AbstractModelContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/AbstractModelContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,8 +15,8 @@
import org.apache.log4j.Logger;
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.ResourceProvider;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.lang.ResourceProvider;
import edu.bonn.xulu.appl.XuluConstants;
import edu.bonn.xulu.data.XuluDataException;
Modified: trunk/src/edu/bonn/xulu/model/AbstractModelResource.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/AbstractModelResource.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/AbstractModelResource.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model;
-import schmitzm.lang.ResourceProvider;
+import de.schmitzm.lang.ResourceProvider;
import edu.bonn.xulu.appl.XuluConstants;
import edu.bonn.xulu.data.XuluDataException;
Modified: trunk/src/edu/bonn/xulu/model/AbstractStepModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/AbstractStepModel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/AbstractStepModel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model;
-import schmitzm.lang.ResourceProvider;
+import de.schmitzm.lang.ResourceProvider;
import edu.bonn.xulu.appl.XuluConstants;
import edu.bonn.xulu.model.event.ModelListener;
import edu.bonn.xulu.model.event.ModelStepFinishedEvent;
Modified: trunk/src/edu/bonn/xulu/model/AbstractXuluModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/AbstractXuluModel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/AbstractXuluModel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -18,11 +18,11 @@
import org.apache.log4j.Logger;
-import schmitzm.data.property.Access;
-import schmitzm.lang.AbstractNamedObject;
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.ResourceProvider;
-import schmitzm.swing.CaptionsChangeable;
+import de.schmitzm.data.property.Access;
+import de.schmitzm.lang.AbstractNamedObject;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.lang.ResourceProvider;
+import de.schmitzm.swing.CaptionsChangeable;
import edu.bonn.xulu.appl.XuluConstants;
import edu.bonn.xulu.model.event.ModelDisposedEvent;
import edu.bonn.xulu.model.event.ModelEvent;
Modified: trunk/src/edu/bonn/xulu/model/ModelContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/ModelContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/ModelContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model;
-import schmitzm.swing.CaptionsChangeable;
+import de.schmitzm.swing.CaptionsChangeable;
import edu.bonn.xulu.data.XuluDataException;
/**
Modified: trunk/src/edu/bonn/xulu/model/PropertiesResource.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/PropertiesResource.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/PropertiesResource.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model;
-import schmitzm.data.property.Properties;
+import de.schmitzm.data.property.Properties;
import edu.bonn.xulu.data.XuluDataException;
/**
Modified: trunk/src/edu/bonn/xulu/model/ValuePropertyResource.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/ValuePropertyResource.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/ValuePropertyResource.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,9 +11,9 @@
package edu.bonn.xulu.model;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.data.property.ValuePropertyType;
-import schmitzm.temp.BaseTypeUtil;
+import de.schmitzm.data.property.ValueProperty;
+import de.schmitzm.data.property.ValuePropertyType;
+import de.schmitzm.temp.BaseTypeUtil;
/**
* Diese Implementierung von <code>ModelResource</code> laesst nur
Modified: trunk/src/edu/bonn/xulu/model/XuluModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/XuluModel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/XuluModel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -14,9 +14,9 @@
import java.awt.Component;
import java.io.PrintStream;
-import schmitzm.lang.NamedObject;
-import schmitzm.lang.ResourceProvider;
-import schmitzm.swing.CaptionsChangeable;
+import de.schmitzm.lang.NamedObject;
+import de.schmitzm.lang.ResourceProvider;
+import de.schmitzm.swing.CaptionsChangeable;
import edu.bonn.xulu.model.event.ModelEvent;
import edu.bonn.xulu.model.event.ModelListener;
Modified: trunk/src/edu/bonn/xulu/model/XuluModelThread.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/XuluModelThread.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/XuluModelThread.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model;
-import schmitzm.lang.WorkingThread;
+import de.schmitzm.lang.WorkingThread;
/**
* Diese Klasse stellt einen Thread dar, der ein {@link XuluModel} ausfuehrt.
Modified: trunk/src/edu/bonn/xulu/model/event/AbstractModelEvent.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/event/AbstractModelEvent.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/event/AbstractModelEvent.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model.event;
-import schmitzm.data.event.AbstractObjectEvent;
+import de.schmitzm.data.event.AbstractObjectEvent;
import edu.bonn.xulu.model.XuluModel;
/**
Modified: trunk/src/edu/bonn/xulu/model/event/ModelAdapter.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/event/ModelAdapter.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/event/ModelAdapter.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model.event;
-import schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectEvent;
import edu.bonn.xulu.model.XuluModel;
/**
Modified: trunk/src/edu/bonn/xulu/model/event/ModelEvent.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/event/ModelEvent.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/event/ModelEvent.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model.event;
-import schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectEvent;
import edu.bonn.xulu.model.XuluModel;
/**
Modified: trunk/src/edu/bonn/xulu/model/event/ModelListener.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/event/ModelListener.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/model/event/ModelListener.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model.event;
-import schmitzm.data.event.ObjectListener;
+import de.schmitzm.data.event.ObjectListener;
/**
* Diese Klasse stellt einen Listener dar, der bei bestimmten Modell-Aktivitaeten
Modified: trunk/src/edu/bonn/xulu/plugin/appl/DataExportHandler.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/DataExportHandler.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/DataExportHandler.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.plugin.appl;
-import schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectEvent;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.AbstractHandler;
import edu.bonn.xulu.gui.XuluGUIMessages;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/DataScriptInterpreter_Basic.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/DataScriptInterpreter_Basic.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/DataScriptInterpreter_Basic.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -18,9 +18,9 @@
import java.io.InputStreamReader;
import java.util.Vector;
-import schmitzm.io.IOUtil;
-import schmitzm.lang.AlreadyHandledException;
-import schmitzm.lang.LangUtil;
+import de.schmitzm.io.IOUtil;
+import de.schmitzm.lang.AlreadyHandledException;
+import de.schmitzm.lang.LangUtil;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.AbstractCommandInterpreter;
import edu.bonn.xulu.appl.ScriptablePlugin;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/DateTimePlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/DateTimePlugin.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/DateTimePlugin.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -14,7 +14,7 @@
import java.text.DateFormat;
import java.util.GregorianCalendar;
-import schmitzm.lang.WorkingThread;
+import de.schmitzm.lang.WorkingThread;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluPlugin;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/DateTimeWindowPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/DateTimeWindowPlugin.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/DateTimeWindowPlugin.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -19,7 +19,7 @@
import javax.swing.JFrame;
import javax.swing.JLabel;
-import schmitzm.lang.WorkingThread;
+import de.schmitzm.lang.WorkingThread;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluPlugin;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/FileExportHandlerFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/FileExportHandlerFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/FileExportHandlerFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -17,12 +17,12 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.swing.FileInputOption;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.SelectionInputOption;
-import schmitzm.swing.event.InputOptionAdapter;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.swing.input.FileInputOption;
+import de.schmitzm.swing.input.InputOption;
+import de.schmitzm.swing.input.InputOptionAdapter;
+import de.schmitzm.swing.input.MultipleOptionPane;
+import de.schmitzm.swing.input.SelectionInputOption;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluConstants;
import edu.bonn.xulu.gui.DataPoolInputOption;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/GTVisualisationColorMapPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/GTVisualisationColorMapPlugin.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/GTVisualisationColorMapPlugin.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -23,14 +23,14 @@
import org.geotools.styling.ColorMap;
import org.geotools.styling.ColorMapImpl;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.geotools.gui.LayeredMapFrame;
-import schmitzm.geotools.styling.ColorMapManager;
-import schmitzm.geotools.styling.StylingUtil;
-import schmitzm.io.IOUtil;
-import schmitzm.lang.AbstractNamedObject;
-import schmitzm.swing.SwingUtil;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.geotools.gui.LayeredMapFrame;
+import de.schmitzm.geotools.styling.ColorMapManager;
+import de.schmitzm.geotools.styling.StylingUtil;
+import de.schmitzm.io.IOUtil;
+import de.schmitzm.lang.AbstractNamedObject;
+import de.schmitzm.swing.SwingUtil;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.VisualisationManager;
import edu.bonn.xulu.appl.XuluPlugin;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGenerator.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGenerator.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGenerator.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -19,19 +19,19 @@
import java.util.StringTokenizer;
import java.util.Vector;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.io.dyntxt.DynamicField;
-import schmitzm.io.dyntxt.DynamicInputProvider;
-import schmitzm.io.dyntxt.DynamicLoop;
-import schmitzm.io.dyntxt.DynamicTextGenerator;
-import schmitzm.lang.LangUtil;
-import schmitzm.temp.BaseTypeUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.ListPropertyWriteAccess;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.io.dyntxt.DynamicField;
+import de.schmitzm.io.dyntxt.DynamicInputProvider;
+import de.schmitzm.io.dyntxt.DynamicLoop;
+import de.schmitzm.io.dyntxt.DynamicTextGenerator;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.temp.BaseTypeUtil;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.AbstractXuluModel;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGeneratorGUI.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGeneratorGUI.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGeneratorGUI.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -36,25 +36,25 @@
import org.geotools.feature.FeatureCollection;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.lang.LangUtil;
-import schmitzm.swing.BooleanInputOption;
-import schmitzm.swing.FileInputOption;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.ManualInputOption;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.SelectionInputOption;
-import schmitzm.swing.SwingUtil;
-import schmitzm.swing.SwingWorker;
-import schmitzm.swing.event.InputOptionAdapter;
-import schmitzm.swing.table.AbstractMutableTableModel;
-import schmitzm.swing.table.ComponentRenderer;
-import schmitzm.swing.table.MutableTable;
-import schmitzm.swing.table.MutableTableModel;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ValueProperty;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.swing.SwingUtil;
+import de.schmitzm.swing.SwingWorker;
+import de.schmitzm.swing.input.BooleanInputOption;
+import de.schmitzm.swing.input.FileInputOption;
+import de.schmitzm.swing.input.InputOption;
+import de.schmitzm.swing.input.InputOptionAdapter;
+import de.schmitzm.swing.input.ManualInputOption;
+import de.schmitzm.swing.input.MultipleOptionPane;
+import de.schmitzm.swing.input.SelectionInputOption;
+import de.schmitzm.swing.table.AbstractMutableTableModel;
+import de.schmitzm.swing.table.ComponentRenderer;
+import de.schmitzm.swing.table.MutableTable;
+import de.schmitzm.swing.table.MutableTableModel;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluConstants;
import edu.bonn.xulu.data.XuluObject;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/LoggerPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/LoggerPlugin.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/LoggerPlugin.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,7 +16,7 @@
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
-import schmitzm.swing.log4j.LoggerFrame;
+import de.schmitzm.swing.log4j.LoggerFrame;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluPlugin;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/ModelResourceMappingScriptInterpreter_Basic.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/ModelResourceMappingScriptInterpreter_Basic.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/ModelResourceMappingScriptInterpreter_Basic.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,7 +16,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
-import schmitzm.io.IOUtil;
+import de.schmitzm.io.IOUtil;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.AbstractScriptInterpreter;
import edu.bonn.xulu.appl.XuluConstants;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/ModelTimeSnifferPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/ModelTimeSnifferPlugin.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/ModelTimeSnifferPlugin.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,9 +13,9 @@
import java.util.Vector;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.lang.AbstractNamedObject;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.lang.AbstractNamedObject;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.ModelControlManager;
import edu.bonn.xulu.appl.XuluPlugin;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorGUI.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorGUI.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorGUI.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,7 +15,7 @@
import java.awt.Container;
import java.awt.Dimension;
-import schmitzm.data.RasterCalculator;
+import de.schmitzm.geotools.data.RasterCalculator;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.gui.XuluInternalFrame;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorPanel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorPanel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorPanel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -31,28 +31,28 @@
import javax.swing.JScrollPane;
import javax.swing.JTextField;
-import schmitzm.data.RasterCalculator;
-import schmitzm.data.RasterFilter;
-import schmitzm.data.RasterOperationTree;
-import schmitzm.data.RasterOperationTreeParser;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.ManualInputOption;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.OperationTreePanel;
-import schmitzm.swing.SelectionInputOption;
-import schmitzm.swing.SwingUtil;
-import schmitzm.swing.table.AbstractMutableTableModel;
-import schmitzm.swing.table.MutableTable;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.Properties;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.RasterCalculator;
+import de.schmitzm.geotools.data.RasterFilter;
+import de.schmitzm.geotools.data.RasterOperationTree;
+import de.schmitzm.geotools.data.RasterOperationTreeParser;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.swing.OperationTreePanel;
+import de.schmitzm.swing.SwingUtil;
+import de.schmitzm.swing.input.InputOption;
+import de.schmitzm.swing.input.ManualInputOption;
+import de.schmitzm.swing.input.MultipleOptionPane;
+import de.schmitzm.swing.input.SelectionInputOption;
+import de.schmitzm.swing.table.AbstractMutableTableModel;
+import de.schmitzm.swing.table.MutableTable;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.data.DynamicXuluObject;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandler.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandler.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandler.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.plugin.appl;
-import schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectEvent;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.AbstractHandler;
import edu.bonn.xulu.appl.VisualisationTool;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandlerFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandlerFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandlerFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,9 +11,9 @@
package edu.bonn.xulu.plugin.appl;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.SelectionInputOption;
+import de.schmitzm.swing.input.InputOption;
+import de.schmitzm.swing.input.MultipleOptionPane;
+import de.schmitzm.swing.input.SelectionInputOption;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.Handler;
import edu.bonn.xulu.appl.HandlerFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/appl/XuluRegistryReader_BasicAscii.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/XuluRegistryReader_BasicAscii.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/appl/XuluRegistryReader_BasicAscii.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -19,9 +19,9 @@
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
-import schmitzm.io.IOUtil;
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.NamedObject;
+import de.schmitzm.io.IOUtil;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.lang.NamedObject;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.ScriptInterpreter;
import edu.bonn.xulu.appl.VisualisationTool;
Modified: trunk/src/edu/bonn/xulu/plugin/data/feature/SingleFeatureCollection.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/data/feature/SingleFeatureCollection.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/data/feature/SingleFeatureCollection.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,7 +13,7 @@
import org.geotools.feature.FeatureCollection;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
import edu.bonn.xulu.data.AbstractXuluObject;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/data/grid/GridList.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/data/grid/GridList.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/data/grid/GridList.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -12,9 +12,9 @@
package edu.bonn.xulu.plugin.data.grid;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.data.AbstractXuluObject;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/data/grid/MultiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/data/grid/MultiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/data/grid/MultiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,9 +15,9 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.AbstractWritableGrid;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.AbstractWritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/data/grid/SingleGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/data/grid/SingleGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/data/grid/SingleGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -12,8 +12,8 @@
package edu.bonn.xulu.plugin.data.grid;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.data.AbstractXuluObject;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/gui/AbstractManagerFrame_BasicTable.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/AbstractManagerFrame_BasicTable.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/AbstractManagerFrame_BasicTable.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -18,13 +18,13 @@
import javax.swing.JButton;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.swing.table.AbstractMutableTableModel;
-import schmitzm.swing.table.ComponentRenderer;
-import schmitzm.swing.table.MutableTable;
-import schmitzm.swing.table.MutableTableModel;
-import schmitzm.swing.table.TableComponentMouseListener;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.swing.table.AbstractMutableTableModel;
+import de.schmitzm.swing.table.ComponentRenderer;
+import de.schmitzm.swing.table.MutableTable;
+import de.schmitzm.swing.table.MutableTableModel;
+import de.schmitzm.swing.table.TableComponentMouseListener;
import edu.bonn.xulu.appl.AbstractManager;
import edu.bonn.xulu.appl.XuluConstants;
import edu.bonn.xulu.gui.AbstractManagerFrame;
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_BasicTable.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_BasicTable.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_BasicTable.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -23,11 +23,11 @@
import javax.swing.JTable;
import javax.swing.table.AbstractTableModel;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.property.Property;
-import schmitzm.swing.MultiSplitPane;
-import schmitzm.swing.event.PopupMenuListener;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.swing.MultiSplitPane;
+import de.schmitzm.swing.event.PopupMenuListener;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.data.XuluObject;
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_Tree.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_Tree.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_Tree.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -25,17 +25,16 @@
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.TreePath;
-import schmitzm.data.property.AccessViolationException;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.swing.MultiSplitPane;
-import schmitzm.swing.ObjectDisplayContainer;
-import schmitzm.swing.event.PopupMenuListener;
-import schmitzm.swing.tree.ContentNode;
-import schmitzm.swing.tree.EditableNode;
+import de.schmitzm.data.property.AccessViolationException;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.swing.MultiSplitPane;
+import de.schmitzm.swing.ObjectDisplayContainer;
+import de.schmitzm.swing.event.PopupMenuListener;
+import de.schmitzm.swing.tree.ContentNode;
+import de.schmitzm.swing.tree.EditableNode;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.gui.DataPoolFrame;
import edu.bonn.xulu.gui.DataPoolMenu;
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_GeomAndGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_GeomAndGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_GeomAndGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -22,9 +22,9 @@
import org.geotools.styling.StyleBuilder;
import org.opengis.geometry.Envelope;
-import schmitzm.geotools.feature.FeatureUtil;
-import schmitzm.geotools.gui.SelectableXMapPane;
-import schmitzm.swing.ObjectDisplayContainer;
+import de.schmitzm.geotools.feature.FeatureUtil;
+import de.schmitzm.geotools.gui.SelectableXMapPane;
+import de.schmitzm.swing.ObjectDisplayContainer;
/**
* Diese Klasse stellt eine GUI-Komponente dar, in der immer eine der folgenden
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_ListProperty.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_ListProperty.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_ListProperty.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,11 +11,11 @@
package edu.bonn.xulu.plugin.gui;
-import schmitzm.data.property.AccessViolationException;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.Property;
-import schmitzm.temp.BaseTypeUtil;
+import de.schmitzm.data.property.AccessViolationException;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyWriteAccess;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.temp.BaseTypeUtil;
import edu.bonn.xulu.gui.XuluGUIMessages;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_MatrixProperty.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_MatrixProperty.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_MatrixProperty.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -19,10 +19,10 @@
import javax.swing.ListSelectionModel;
import javax.swing.table.DefaultTableCellRenderer;
-import schmitzm.data.property.AccessViolationException;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.temp.BaseTypeUtil;
+import de.schmitzm.data.property.AccessViolationException;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.temp.BaseTypeUtil;
import edu.bonn.xulu.gui.XuluGUIMessages;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Properties.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Properties.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Properties.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,13 +11,13 @@
package edu.bonn.xulu.plugin.gui;
-import schmitzm.data.property.AccessViolationException;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.PropertySet;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.temp.BaseTypeUtil;
+import de.schmitzm.data.property.AccessViolationException;
+import de.schmitzm.data.property.Properties;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.PropertySet;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.temp.BaseTypeUtil;
import edu.bonn.xulu.gui.XuluGUIMessages;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Table.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Table.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Table.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -17,7 +17,7 @@
import javax.swing.JTable;
import javax.swing.table.AbstractTableModel;
-import schmitzm.swing.ObjectDisplayContainer;
+import de.schmitzm.swing.ObjectDisplayContainer;
/**
* Diese Klasse stellt eine abstrakte Oberklasse fuer die Darstellung
Modified: trunk/src/edu/bonn/xulu/plugin/gui/EventManagerFrame_BasicTable.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/EventManagerFrame_BasicTable.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/EventManagerFrame_BasicTable.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,11 +15,11 @@
import javax.swing.JInternalFrame;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.SelectionInputOption;
-import schmitzm.swing.event.InputOptionAdapter;
-import schmitzm.swing.table.MutableTable;
+import de.schmitzm.swing.input.InputOption;
+import de.schmitzm.swing.input.InputOptionAdapter;
+import de.schmitzm.swing.input.MultipleOptionPane;
+import de.schmitzm.swing.input.SelectionInputOption;
+import de.schmitzm.swing.table.MutableTable;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.AbstractManager;
import edu.bonn.xulu.appl.EventHandler;
Modified: trunk/src/edu/bonn/xulu/plugin/gui/ModelControlContainer.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/ModelControlContainer.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/ModelControlContainer.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -19,10 +19,10 @@
import javax.swing.BoxLayout;
import javax.swing.JButton;
-import schmitzm.lang.WorkingThread;
-import schmitzm.lang.WorkingThreadAdapter;
-import schmitzm.lang.WorkingThreadListener;
import appl.plugin.multimodelcontrol.MultiModelControlPlugin;
+import de.schmitzm.lang.WorkingThread;
+import de.schmitzm.lang.WorkingThreadAdapter;
+import de.schmitzm.lang.WorkingThreadListener;
import edu.bonn.xulu.gui.XuluGUIMessages;
import edu.bonn.xulu.model.StepModel;
import edu.bonn.xulu.model.StepModelThread;
Modified: trunk/src/edu/bonn/xulu/plugin/gui/ModelControlFrame_Basic.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/ModelControlFrame_Basic.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/ModelControlFrame_Basic.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -30,13 +30,13 @@
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.WorkingThread;
-import schmitzm.lang.WorkingThreadAdapter;
-import schmitzm.swing.SwingUtil;
-import schmitzm.swing.TextAreaPrintStream;
-import schmitzm.swing.event.PopupMenuListener;
import appl.plugin.multimodelcontrol.MultiModelControlPlugin;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.lang.WorkingThread;
+import de.schmitzm.lang.WorkingThreadAdapter;
+import de.schmitzm.swing.SwingUtil;
+import de.schmitzm.swing.TextAreaPrintStream;
+import de.schmitzm.swing.event.PopupMenuListener;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.EventHandler;
import edu.bonn.xulu.appl.EventManager;
Modified: trunk/src/edu/bonn/xulu/plugin/gui/PluginManagerFrame_BasicTable.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/PluginManagerFrame_BasicTable.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/PluginManagerFrame_BasicTable.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -19,13 +19,13 @@
import javax.swing.JScrollPane;
import javax.swing.ListSelectionModel;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.swing.StoplightContainer;
-import schmitzm.swing.table.AbstractMutableTableModel;
-import schmitzm.swing.table.ComponentRenderer;
-import schmitzm.swing.table.MutableTable;
-import schmitzm.swing.table.TableComponentMouseListener;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.swing.StoplightContainer;
+import de.schmitzm.swing.table.AbstractMutableTableModel;
+import de.schmitzm.swing.table.ComponentRenderer;
+import de.schmitzm.swing.table.MutableTable;
+import de.schmitzm.swing.table.TableComponentMouseListener;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluPlugin;
import edu.bonn.xulu.appl.XuluRegistry;
Modified: trunk/src/edu/bonn/xulu/plugin/gui/RegistryFrame_Tree.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/RegistryFrame_Tree.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/RegistryFrame_Tree.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -23,13 +23,13 @@
import javax.swing.tree.MutableTreeNode;
import javax.swing.tree.TreeSelectionModel;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.lang.AlreadyHandledException;
-import schmitzm.swing.tree.ContentNode;
-import schmitzm.swing.tree.EditableNode;
-import schmitzm.swing.tree.EmptyInnerNode;
-import schmitzm.swing.tree.EmptyNode;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.lang.AlreadyHandledException;
+import de.schmitzm.swing.tree.ContentNode;
+import de.schmitzm.swing.tree.EditableNode;
+import de.schmitzm.swing.tree.EmptyInnerNode;
+import de.schmitzm.swing.tree.EmptyNode;
import edu.bonn.xulu.appl.ScriptInterpreter;
import edu.bonn.xulu.appl.XuluPlugin;
import edu.bonn.xulu.appl.XuluRegistry;
Modified: trunk/src/edu/bonn/xulu/plugin/gui/StatusFrame_BasicTextArea.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/StatusFrame_BasicTextArea.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/gui/StatusFrame_BasicTextArea.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -22,7 +22,7 @@
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
-import schmitzm.swing.event.PopupMenuListener;
+import de.schmitzm.swing.event.PopupMenuListener;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.gui.StatusFrame;
Modified: trunk/src/edu/bonn/xulu/plugin/io/IOUtil.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/IOUtil.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/IOUtil.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,12 +16,11 @@
import org.geotools.styling.Style;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.styling.StylingUtil;
-import skrueger.geotools.StyledLayerStyle;
-import skrueger.geotools.StyledLayerUtil;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.styling.StyledLayerStyle;
+import de.schmitzm.geotools.styling.StyledLayerUtil;
+import de.schmitzm.geotools.styling.StylingUtil;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/feature/gt/SingleFeatureCollectionFactory_ShapeFile.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/feature/gt/SingleFeatureCollectionFactory_ShapeFile.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/feature/gt/SingleFeatureCollectionFactory_ShapeFile.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,8 +13,8 @@
import java.io.File;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/WritableGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/WritableGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/WritableGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,12 +15,12 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGrid;
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.ManualInputOption;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.SelectionInputOption;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.swing.input.InputOption;
+import de.schmitzm.swing.input.ManualInputOption;
+import de.schmitzm.swing.input.MultipleOptionPane;
+import de.schmitzm.swing.input.SelectionInputOption;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.FactoryCanceledException;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.plugin.io.grid.array;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.GridList;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,10 +13,10 @@
import java.io.File;
-import schmitzm.data.WritableGridArray;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.io.IOUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.geotools.data.WritableGridArray;
+import de.schmitzm.io.IOUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/MultiGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/MultiGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/MultiGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.plugin.io.grid.array;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/MultiGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/MultiGridFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/MultiGridFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,8 +13,7 @@
import java.io.File;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.plugin.io.grid.array;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,7 +13,7 @@
import java.io.File;
-import schmitzm.data.WritableGridArray;
+import de.schmitzm.geotools.data.WritableGridArray;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory_GeoTiff.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory_GeoTiff.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory_GeoTiff.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,7 +13,7 @@
import java.io.File;
-import schmitzm.data.WritableGridArray;
+import de.schmitzm.geotools.data.WritableGridArray;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,7 +16,7 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGridArray;
+import de.schmitzm.geotools.data.WritableGridArray;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -17,10 +17,10 @@
import org.geotools.coverage.grid.GridCoverageFactory;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGridArray;
-import schmitzm.geotools.GTUtil;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.GTUtil;
+import de.schmitzm.geotools.data.WritableGridArray;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.AbstractFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory_GeoTiff.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory_GeoTiff.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory_GeoTiff.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -17,10 +17,10 @@
import org.geotools.coverage.grid.GridCoverageFactory;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGridArray;
-import schmitzm.geotools.GTUtil;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.GTUtil;
+import de.schmitzm.geotools.data.WritableGridArray;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.AbstractFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,10 +11,10 @@
package edu.bonn.xulu.plugin.io.grid.awt;
-import schmitzm.data.WritableGrid;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.ManualInputOption;
-import schmitzm.swing.MultipleOptionPane;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.swing.input.InputOption;
+import de.schmitzm.swing.input.ManualInputOption;
+import de.schmitzm.swing.input.MultipleOptionPane;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.FactoryCanceledException;
import edu.bonn.xulu.io.InstantiationFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,12 +15,12 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGridRaster;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.io.IOUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.geotools.data.WritableGridRaster;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.io.IOUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/MultiGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/MultiGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/MultiGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,10 +11,10 @@
package edu.bonn.xulu.plugin.io.grid.awt;
-import schmitzm.data.WritableGrid;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.ManualInputOption;
-import schmitzm.swing.MultipleOptionPane;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.swing.input.InputOption;
+import de.schmitzm.swing.input.ManualInputOption;
+import de.schmitzm.swing.input.MultipleOptionPane;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.FactoryCanceledException;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/MultiGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/MultiGridFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/MultiGridFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,9 +15,9 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridRaster;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGridRaster;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.InstantiationFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.plugin.io.grid.awt;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,10 +15,10 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridRaster;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGridRaster;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_GeoTiff.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_GeoTiff.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_GeoTiff.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,10 +15,10 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridRaster;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGridRaster;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,7 +15,7 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGridRaster;
+import de.schmitzm.geotools.data.WritableGridRaster;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,9 +15,9 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGridRaster;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.data.WritableGridRaster;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.AbstractFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory_GeoTiff.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory_GeoTiff.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory_GeoTiff.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,9 +15,9 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGridRaster;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.data.WritableGridRaster;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.AbstractFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,7 +16,7 @@
import org.geotools.geometry.Envelope2D;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.geotools.grid.WritableGridCoverage;
+import de.schmitzm.geotools.grid.WritableGridCoverage;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,9 +16,9 @@
import org.geotools.coverage.grid.GridCoverage2D;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.geotools.grid.WritableGridCoverage;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.grid.WritableGridCoverage;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.AbstractFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory_GeoTiff.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory_GeoTiff.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory_GeoTiff.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,9 +16,9 @@
import org.geotools.coverage.grid.GridCoverage2D;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.geotools.grid.WritableGridCoverage;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.grid.WritableGridCoverage;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.AbstractFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.plugin.io.grid.gt;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.GridList;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,12 +16,12 @@
import org.geotools.coverage.grid.GridCoverage2D;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.geotools.grid.WritableGridCoverage;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.io.IOUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.geotools.grid.WritableGridCoverage;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.io.IOUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/MultiGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/MultiGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/MultiGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.plugin.io.grid.gt;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/MultiGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/MultiGridFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/MultiGridFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,9 +16,9 @@
import org.geotools.coverage.grid.GridCoverage2D;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.data.WritableGrid;
-import schmitzm.geotools.grid.WritableGridCoverage;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.grid.WritableGridCoverage;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.plugin.io.grid.gt;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,9 +16,9 @@
import org.geotools.coverage.grid.GridCoverage2D;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.geotools.grid.WritableGridCoverage;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.grid.WritableGridCoverage;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_GeoTiff.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_GeoTiff.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_GeoTiff.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,9 +16,9 @@
import org.geotools.coverage.grid.GridCoverage2D;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.geotools.grid.WritableGridCoverage;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
+import de.schmitzm.geotools.grid.WritableGridCoverage;
+import de.schmitzm.geotools.io.GeoExportUtil;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.plugin.io.grid.lateloading;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.GridList;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,14 +13,13 @@
import java.io.File;
-import schmitzm.data.WritableGridArray;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.io.IOUtil;
import appl.data.DataProxy;
import appl.data.WritableGridLLProxy;
import appl.ext.XuluConfig;
import appl.util.RasterUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.io.IOUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/MultiGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/MultiGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/MultiGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.plugin.io.grid.lateloading;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/MultiGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/MultiGridFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/MultiGridFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,11 +13,10 @@
import java.io.File;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
import appl.data.WritableGridLLProxy;
import appl.ext.XuluConfig;
import appl.util.RasterUtil;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ImportFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.plugin.io.grid.lateloading;
-import schmitzm.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory_ArcInfoAsciiGrid.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory_ArcInfoAsciiGrid.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,7 +13,6 @@
import java.io.File;
-import schmitzm.data.WritableGridArray;
import appl.data.DataProxy;
import appl.data.WritableGridLLProxy;
import appl.ext.XuluConfig;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory_GeoTiff.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory_GeoTiff.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory_GeoTiff.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,7 +13,6 @@
import java.io.File;
-import schmitzm.data.WritableGridArray;
import appl.data.DataProxy;
import appl.data.WritableGridLLProxy;
import edu.bonn.xulu.appl.XuluRegistry;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/WritableGridLLFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/WritableGridLLFactory.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/WritableGridLLFactory.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -14,7 +14,7 @@
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import appl.data.WritableGridLLProxy;
-import appl.util.RasterMetaData;
+import de.appl.util.RasterMetaData;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
Modified: trunk/src/edu/bonn/xulu/plugin/io/misc/CAAreaListFactory_ShapeFile.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/misc/CAAreaListFactory_ShapeFile.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/misc/CAAreaListFactory_ShapeFile.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -17,12 +17,11 @@
import org.geotools.feature.FeatureIterator;
import org.opengis.feature.simple.SimpleFeature;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.geotools.io.GeoImportUtil;
-
import com.vividsolutions.jts.geom.Point;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyWriteAccess;
+import de.schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.data.DynamicXuluObject;
import edu.bonn.xulu.data.XuluObject;
Modified: trunk/src/edu/bonn/xulu/plugin/io/misc/CASettlementAreaListFactory_ShapeFile.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/misc/CASettlementAreaListFactory_ShapeFile.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/misc/CASettlementAreaListFactory_ShapeFile.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,7 +13,7 @@
import org.opengis.feature.simple.SimpleFeature;
-import schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListProperty;
import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.plugin.data.misc.CAArea;
import edu.bonn.xulu.plugin.data.misc.CASettlementArea;
Modified: trunk/src/edu/bonn/xulu/plugin/io/misc/DynamicXuluObjectFactory_BasicStructure.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/misc/DynamicXuluObjectFactory_BasicStructure.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/io/misc/DynamicXuluObjectFactory_BasicStructure.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -25,19 +25,19 @@
import org.apache.log4j.Logger;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.data.property.ValuePropertyType;
-import schmitzm.lang.LangUtil;
-import schmitzm.temp.BaseTypeUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.ListPropertyWriteAccess;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.Properties;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ValueProperty;
+import de.schmitzm.data.property.ValuePropertyType;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.temp.BaseTypeUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.data.DynamicXuluObject;
import edu.bonn.xulu.data.XuluDataException;
@@ -186,6 +186,7 @@
} catch ( Exception err ) {
System.err.println( getClass().getSimpleName().concat(" --> ").concat(err.toString()) );
System.err.println( " Line ".concat(String.valueOf(lineNo)).concat(": ").concat(line) );
+ LOGGER.debug(err.getMessage(),err);
}
}
Modified: trunk/src/edu/bonn/xulu/plugin/model/ca/MultiCellularAutomaton.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/ca/MultiCellularAutomaton.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/ca/MultiCellularAutomaton.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,13 +15,13 @@
import java.util.TreeSet;
import java.util.Vector;
-import schmitzm.data.AbstractWritableGrid;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.lang.ComparableObject;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyWriteAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.AbstractWritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.lang.ComparableObject;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.AbstractStepModel;
Modified: trunk/src/edu/bonn/xulu/plugin/model/ca/agric/ImpetusCellularAutomaton.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/ca/agric/ImpetusCellularAutomaton.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/ca/agric/ImpetusCellularAutomaton.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -14,11 +14,11 @@
import java.awt.Point;
import java.util.Vector;
-import schmitzm.data.AbstractWritableGrid;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.AbstractWritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.ModelContentManager;
import edu.bonn.xulu.model.ValuePropertyResource;
Modified: trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCA.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCA.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCA.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -41,24 +41,23 @@
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.ResourceProvider;
-import schmitzm.swing.CaptionsChangeable;
-import schmitzm.swing.InputCompass;
-import schmitzm.swing.JPanel;
-import schmitzm.swing.SliderSpinnerPanel;
-
import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.MultiPoint;
import com.vividsolutions.jts.geom.Point;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.jfree.chart.InputCompass;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.lang.ResourceProvider;
+import de.schmitzm.swing.CaptionsChangeable;
+import de.schmitzm.swing.JPanel;
+import de.schmitzm.swing.SliderSpinnerPanel;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.data.DynamicXuluObject;
import edu.bonn.xulu.model.AbstractStepModel;
Modified: trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCAContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCAContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCAContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -18,15 +18,14 @@
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
-import schmitzm.data.AbstractWritableGrid;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ScalarProperty;
-
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.MultiPoint;
import com.vividsolutions.jts.geom.Point;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.AbstractWritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.data.DynamicXuluObject;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.AbstractModelContentManager;
Modified: trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -43,22 +43,21 @@
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.geotools.grid.GridUtil;
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.ResourceProvider;
-import schmitzm.swing.JPanel;
-import schmitzm.swing.SliderSpinnerPanel;
-
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.LineString;
import com.vividsolutions.jts.geom.MultiLineString;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyWriteAccess;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.grid.GridUtil;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.lang.ResourceProvider;
+import de.schmitzm.swing.JPanel;
+import de.schmitzm.swing.SliderSpinnerPanel;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.AbstractStepModel;
Modified: trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModelContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModelContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModelContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -18,16 +18,15 @@
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
-import schmitzm.data.AbstractWritableGrid;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.lang.ResourceProvider;
-
import com.vividsolutions.jts.geom.Geometry;
import com.vividsolutions.jts.geom.LineString;
import com.vividsolutions.jts.geom.MultiLineString;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.AbstractWritableGrid;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.lang.ResourceProvider;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.AbstractXuluModel;
Modified: trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -36,18 +36,18 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.ResourceProvider;
-import schmitzm.swing.ExpansionBar;
-import schmitzm.swing.SpringUtilities;
-import schmitzm.swing.SwingUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.ListPropertyWriteAccess;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.lang.ResourceProvider;
+import de.schmitzm.swing.ExpansionBar;
+import de.schmitzm.swing.SpringUtilities;
+import de.schmitzm.swing.SwingUtil;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
Modified: trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModelContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModelContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModelContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,12 +13,12 @@
import java.util.Map;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.temp.BaseTypeUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.temp.BaseTypeUtil;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.AbstractModelResource;
Modified: trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Optimized.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Optimized.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Optimized.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -16,11 +16,11 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
Modified: trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Original.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Original.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Original.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -26,17 +26,17 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.lang.LangUtil;
-import schmitzm.swing.ExpansionBar;
-import schmitzm.swing.SpringUtilities;
-import schmitzm.swing.SwingUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.ListPropertyWriteAccess;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.swing.ExpansionBar;
+import de.schmitzm.swing.SpringUtilities;
+import de.schmitzm.swing.SwingUtil;
import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
Modified: trunk/src/edu/bonn/xulu/plugin/model/mrv/MultipleResolutionValidation.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/mrv/MultipleResolutionValidation.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/mrv/MultipleResolutionValidation.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,11 +1,11 @@
package edu.bonn.xulu.plugin.model.mrv;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyWriteAccess;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.XuluModel;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
Modified: trunk/src/edu/bonn/xulu/plugin/model/mrv/MultipleResolutionValidationContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/mrv/MultipleResolutionValidationContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/mrv/MultipleResolutionValidationContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,14 +1,15 @@
package edu.bonn.xulu.plugin.model.mrv;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.DefaultModelResource;
import edu.bonn.xulu.model.ModelResource;
import edu.bonn.xulu.model.ValuePropertyResource;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
import edu.bonn.xulu.plugin.model.clue.ClueModelContentManager;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ScalarProperty;
+import edu.bonn.xulu.plugin.model.parallel.demo.AverageNeighborhoodContentManager;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,11 +1,11 @@
package edu.bonn.xulu.plugin.model.parallel;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.temp.BaseTypeUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.temp.BaseTypeUtil;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.AbstractModelResource;
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelParallel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelParallel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelParallel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -24,19 +24,19 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.lang.LangUtil;
-import schmitzm.swing.ExpansionBar;
-import schmitzm.swing.SpringUtilities;
-import schmitzm.swing.SwingUtil;
import appl.parallel.model.AbstractParallelStepModel;
import appl.parallel.spmd.MultiDataObject;
import appl.parallel.spmd.SPMDClientInterface;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.swing.ExpansionBar;
+import de.schmitzm.swing.SpringUtilities;
+import de.schmitzm.swing.SwingUtil;
import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModel_deterministic.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModel_deterministic.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModel_deterministic.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -26,16 +26,16 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.lang.LangUtil;
-import schmitzm.swing.ExpansionBar;
-import schmitzm.swing.SpringUtilities;
-import schmitzm.swing.SwingUtil;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.swing.ExpansionBar;
+import de.schmitzm.swing.SpringUtilities;
+import de.schmitzm.swing.SwingUtil;
import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueParallelTuned.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueParallelTuned.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueParallelTuned.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -24,21 +24,21 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.lang.LangUtil;
-import schmitzm.swing.ExpansionBar;
-import schmitzm.swing.SpringUtilities;
-import schmitzm.swing.SwingUtil;
import appl.parallel.model.AbstractParallelStepModel;
import appl.parallel.spmd.AdvancedSPMDClientInterface;
import appl.parallel.spmd.MultiDataObject;
import appl.parallel.spmd.SyncPoint;
import appl.parallel.spmd.SyncPoint.Priority;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.lang.LangUtil;
+import de.schmitzm.swing.ExpansionBar;
+import de.schmitzm.swing.SpringUtilities;
+import de.schmitzm.swing.SwingUtil;
import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTask.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTask.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTask.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -3,10 +3,10 @@
import java.util.HashMap;
import java.util.Map;
-import schmitzm.data.WritableGrid;
import appl.parallel.spmd.AbstractSPMDTask;
import appl.parallel.spmd.MultiDataObject;
import appl.parallel.spmd.SPMDServerInterface;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.plugin.model.clue.ClueModel;
import edu.bonn.xulu.plugin.model.parallel.ClueTaskDefinition.Task;
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTaskTuned.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTaskTuned.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTaskTuned.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -3,12 +3,12 @@
import java.util.HashMap;
import java.util.Map;
-import schmitzm.data.WritableGrid;
import appl.parallel.spmd.AbstractSPMDTask;
import appl.parallel.spmd.AdvancedSPMDServerInterface;
import appl.parallel.spmd.MultiDataObject;
import appl.parallel.spmd.SyncPoint;
import appl.parallel.spmd.SyncPoint.Priority;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.plugin.model.parallel.ClueTaskDefinition.Task;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTask.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTask.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTask.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,11 +2,11 @@
import java.awt.Rectangle;
-import schmitzm.data.WritableGrid;
import appl.parallel.spmd.AbstractSPMDTask;
import appl.parallel.spmd.AdvancedSPMDServerInterface;
import appl.parallel.spmd.SPMDTask;
import appl.util.RasterUtil;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* This is the {@link SPMDTask} which will be executed on server side by the
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTuned.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTuned.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTuned.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,13 +1,13 @@
package edu.bonn.xulu.plugin.model.parallel.demo;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
import appl.parallel.model.AbstractParallelStepModel;
import appl.parallel.spmd.AdvancedSPMDClientInterface;
import appl.parallel.spmd.SyncPoint;
import appl.util.RasterUtil;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
/**
*This is a tuned version of the {@link AverageNeighborhoodParallelDemoModel}, which uses
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTunedTask.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTunedTask.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTunedTask.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,12 +2,12 @@
import java.awt.Rectangle;
-import schmitzm.data.WritableGrid;
import appl.parallel.spmd.AbstractSPMDTask;
import appl.parallel.spmd.AdvancedSPMDServerInterface;
import appl.parallel.spmd.SPMDTask;
import appl.parallel.spmd.SyncPoint;
import appl.util.RasterUtil;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* This is the {@link SPMDTask} which will be executed on server side by
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,7 +1,7 @@
package edu.bonn.xulu.plugin.model.parallel.demo;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.ModelResource;
import edu.bonn.xulu.model.ValuePropertyResource;
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodParallelDemoModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodParallelDemoModel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodParallelDemoModel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,12 +1,12 @@
package edu.bonn.xulu.plugin.model.parallel.demo;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
import appl.parallel.model.AbstractParallelStepModel;
import appl.parallel.spmd.SPMDClientInterface;
import appl.util.RasterUtil;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
/**
* This class is a simple demo algorithm for the usage of Xulu / V. It
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodSerialDemoModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodSerialDemoModel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodSerialDemoModel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,11 +2,11 @@
import java.awt.Rectangle;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
import appl.util.RasterUtil;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.XuluModel;
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/CopyUrbanInActualLU.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/CopyUrbanInActualLU.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/CopyUrbanInActualLU.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,11 +1,10 @@
package edu.bonn.xulu.plugin.model.sleuth;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractStepModel;
-import appl.util.RasterUtil;
public class CopyUrbanInActualLU extends AbstractStepModel {
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/CopyUrbanInActualLUContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/CopyUrbanInActualLUContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/CopyUrbanInActualLUContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,10 +1,11 @@
package edu.bonn.xulu.plugin.model.sleuth;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.ModelResource;
import edu.bonn.xulu.model.ValuePropertyResource;
+import edu.bonn.xulu.plugin.model.parallel.demo.AverageNeighborhoodParallelDemoModel;
public class CopyUrbanInActualLUContentManager extends AbstractModelContentManager {
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/MultipleResolutionValidation.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/MultipleResolutionValidation.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/MultipleResolutionValidation.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,11 +1,11 @@
package edu.bonn.xulu.plugin.model.sleuth;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyWriteAccess;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.XuluModel;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/MultipleResolutionValidationContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/MultipleResolutionValidationContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/MultipleResolutionValidationContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,14 +1,15 @@
package edu.bonn.xulu.plugin.model.sleuth;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.DefaultModelResource;
import edu.bonn.xulu.model.ModelResource;
import edu.bonn.xulu.model.ValuePropertyResource;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
import edu.bonn.xulu.plugin.model.clue.ClueModelContentManager;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ScalarProperty;
+import edu.bonn.xulu.plugin.model.parallel.demo.AverageNeighborhoodContentManager;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,11 +1,14 @@
package edu.bonn.xulu.plugin.model.sleuth;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.ModelResource;
import edu.bonn.xulu.model.ValuePropertyResource;
import edu.bonn.xulu.plugin.model.clue.ClueModelContentManager;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ScalarProperty;
+import edu.bonn.xulu.plugin.model.parallel.demo.AVNTuned;
+import edu.bonn.xulu.plugin.model.parallel.demo.AverageNeighborhoodParallelDemoModel;
+import edu.bonn.xulu.plugin.model.parallel.demo.AverageNeighborhoodSerialDemoModel;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -2,15 +2,14 @@
import java.util.HashMap;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.XuluModel;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
-
/**
* <b>Urban Growth Model</b><br>
* This Model simulates urban growth. It is based on the algorithm of the SLEUTH-Model, which has originally been written in C code and could
@@ -733,13 +732,13 @@
for (int nbRoadCellsY = Y - roadNeighborhoodRange; nbRoadCellsY <= Y + roadNeighborhoodRange; nbRoadCellsY++){ //again increase the neighborhood in every loop
//statusOut.println("TEST-ROAD: "+nbRoadCellsX+","+nbRoadCellsY);
if ( nbRoadCellsX < areaMinX || nbRoadCellsY < areaMinY || nbRoadCellsX > areaMaxX || nbRoadCellsY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadCellsX,nbRoadCellsY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadCellsX,nbRoadCellsY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue; //if a cell is outside the raster (NaN), break and continue loop from the beginning
float roadValueNbTemp = roadGrid.getRasterSampleAsFloat(nbRoadCellsX,nbRoadCellsY); //take the road value from that pixel
if (roadValueNbTemp > 0f){ //if the value is greater than 0 and thus is a road...
anzTempRoadNb++; //increase the number of temporary road neighbors
tempNbRoadCell = new int[] {nbRoadCellsX,nbRoadCellsY,anzTempRoadNb}; //build an array of neighboring road cells with its coordinates
- // statusOut.println("in Array: "+tempNbRoadCell[2]+"Random: "+RSearchNbRoad+"Anzahl temporärer Zellen: "+anzTempRoadNb);
+ // statusOut.println("in Array: "+tempNbRoadCell[2]+"Random: "+RSearchNbRoad+"Anzahl tempor�rer Zellen: "+anzTempRoadNb);
if (tempNbRoadCell[2]==RSearchNbRoad){ //check the position in that array with the random number
tempRoadCell = tempNbRoadCell; //the main temporary road cell is moved to this position
//statusOut.println("Strasse in Entfernung "+roadSearch+": "+tempRoadCell[0]+","+tempRoadCell[1]+","+tempRoadCell[2]);
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibration.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibration.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibration.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,13 +1,13 @@
package edu.bonn.xulu.plugin.model.sleuth;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyWriteAccess;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.XuluModel;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
/**
* <b>Calibration of the Urban Growth Model</b><br>
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibrationContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibrationContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibrationContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,8 +1,8 @@
package edu.bonn.xulu.plugin.model.sleuth;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.DefaultModelResource;
import edu.bonn.xulu.model.ModelResource;
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibrationSelfModification.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibrationSelfModification.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibrationSelfModification.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,9 +1,9 @@
package edu.bonn.xulu.plugin.model.sleuth;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.XuluModel;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.ScalarProperty;
/**
* <b>Calibration of the Urban Growth Model with Self Modification</b><br>
@@ -302,7 +302,7 @@
// anzGesamt++;
boolean lebt = outputGrid.getRasterSampleAsFloat(X , Y ) > 0f; //a cell is alive, when it is 1
- boolean road = roadGrid.getRasterSampleAsFloat(X, Y) > 0f; //eine Zelle beinhaltet eine Straße...
+ boolean road = roadGrid.getRasterSampleAsFloat(X, Y) > 0f; //eine Zelle beinhaltet eine Stra�e...
if (tmpGrid[x][y] == false) //if there is nothing in the temporary raster
tmpGrid[x][y] = lebt; //take the values from the current output raster
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibrationSelfModificationContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibrationSelfModificationContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelCalibrationSelfModificationContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,6 +1,6 @@
package edu.bonn.xulu.plugin.model.sleuth;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.ModelResource;
import edu.bonn.xulu.model.ValuePropertyResource;
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,7 +1,7 @@
package edu.bonn.xulu.plugin.model.sleuth;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.DefaultModelResource;
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModification.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModification.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModification.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,8 +1,8 @@
package edu.bonn.xulu.plugin.model.sleuth;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.ScalarProperty;
import edu.bonn.xulu.model.XuluModel;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.ScalarProperty;
/**
* <b>Urban Growth Model with Self Modification</b><br>
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModificationContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModificationContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModificationContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,6 +1,6 @@
package edu.bonn.xulu.plugin.model.sleuth;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.ModelResource;
import edu.bonn.xulu.model.ValuePropertyResource;
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModifying.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModifying.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModifying.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,17 +1,18 @@
package edu.bonn.xulu.plugin.model.sleuth;
-import java.awt.Rectangle;
import java.util.HashMap;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.PropertyWriteAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.XuluModel;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
+import edu.bonn.xulu.plugin.model.parallel.demo.AVNTuned;
+import edu.bonn.xulu.plugin.model.parallel.demo.AverageNeighborhoodContentManager;
+import edu.bonn.xulu.plugin.model.parallel.demo.AverageNeighborhoodParallelDemoModel;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
-
/**
* This very simple model looks at every grid cell and takes the average
* over a the surrounding cells in a specified neighborhood. It was implemented
@@ -220,7 +221,7 @@
for (int x = 0; x < inputGrid.getWidth();x++ )
for (int y = 0; y < inputGrid.getHeight(); y++ ) {
if ( x < inputGrid.getMinX() || y < inputGrid.getMinY() || x > inputGrid.getMinX()+inputGrid.getWidth()-1 || y > inputGrid.getMinY()+inputGrid.getHeight()-1 ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(x,y)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(x,y)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
totalPixels++;
if (areaRestr.getRasterSampleAsFloat(x,y) != 0 && !Float.isNaN(areaRestr.getRasterSampleAsFloat(x,y)))
@@ -356,12 +357,12 @@
* DISPERSION and BREED
*****************************************************************/
- int p = 0; //Verteile soviel neue Pixel zufällig in geeigneten Bereichen, bis disp_value erreicht ist
+ int p = 0; //Verteile soviel neue Pixel zuf�llig in geeigneten Bereichen, bis disp_value erreicht ist
do{
dispRandX = Math.round((float) Math.random()*areaWidth); //Zufallsposition in X-Richtung
dispRandY = Math.round((float) Math.random()*areaHeight); //Zufallsposition in Y-Richtung
if ( dispRandX < areaMinX || dispRandY < areaMinY || dispRandX > areaMaxX || dispRandY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(dispRandX,dispRandY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(dispRandX,dispRandY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
if (areaRestr.getRasterSampleAsFloat(dispRandX,dispRandY) != 0 || outputGrid.getRasterSampleAsFloat(dispRandX,dispRandY) == 1)
continue; //wenn in Area Restriction oder wenn schon Siedlung da ist, mach weiter
@@ -371,7 +372,7 @@
double slopeDouble = doubleObj.doubleValue(); //konvertiert Double-Objekt in double-Wert
// statusOut.println(getSlope+","+slopeDouble+"----Random: "+slopeRandDisp);
if(slopeDouble < slopeRandDisp){
- tmpGrid[dispRandX][dispRandY] = true; //true wird ins temporäre Raster geschrieben
+ tmpGrid[dispRandX][dispRandY] = true; //true wird ins tempor�re Raster geschrieben
anzDispTreffer++;
//BREED
float breedRnd = (float) Math.random()*100;
@@ -397,7 +398,7 @@
nbBreedX = dispRandX+NEIGHBOR[cellBreed][0];
nbBreedY = dispRandY+NEIGHBOR[cellBreed][1];
if ( nbBreedX < areaMinX || nbBreedY < areaMinY || nbBreedX > areaMaxX || nbBreedY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(nbBreedX,nbBreedY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(nbBreedX,nbBreedY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
if (areaRestr.getRasterSampleAsFloat(nbBreedX,nbBreedY) != 0)
continue;
@@ -417,9 +418,9 @@
}
}
} p++;
- } while (p < disp_value); //while, statt for-Schleife, da Überprüfung erst am Ende vorgenommen werden kann
- //am Anfang der Schleife ist noch nicht klar, ob alle Pixel verteilt werden können
- //da ein Teil in Ausschlussflächen etc. landen würde
+ } while (p < disp_value); //while, statt for-Schleife, da �berpr�fung erst am Ende vorgenommen werden kann
+ //am Anfang der Schleife ist noch nicht klar, ob alle Pixel verteilt werden k�nnen
+ //da ein Teil in Ausschlussfl�chen etc. landen w�rde
/*********************************************************************
* EDGE
@@ -427,7 +428,7 @@
//iterate over all cells
for (int x = 0; x < inputGrid.getWidth(); x++)
- for (int y = 0; y < inputGrid.getHeight(); y++) { //für jede Zelle in x/y-Richtung
+ for (int y = 0; y < inputGrid.getHeight(); y++) { //f�r jede Zelle in x/y-Richtung
int areaMinXadd = areaMinX + x; //Dimensionen des Rasters
int areaMinYadd = areaMinY + y;
@@ -442,12 +443,12 @@
nbY = y+NEIGHBOR[nbCellIdx][1];
nbCell = new int[] {nbX,nbY}; //jede Nachbarzelle
if ( nbX < areaMinX || nbY < areaMinY || nbX > areaMaxX || nbY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(nbX,nbY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(nbX,nbY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
if (areaRestr.getRasterSampleAsFloat(nbX,nbY) != 0)
continue;
float rasterSample = outputGrid.getRasterSampleAsFloat(nbX,nbY);
- if (rasterSample > 0f) //ist Nachbarzelle urban (1), wird sie gezählt
+ if (rasterSample > 0f) //ist Nachbarzelle urban (1), wird sie gez�hlt
anzNachbarn++;
if (rasterSample == 0f)
noNachbarn++;
@@ -462,7 +463,7 @@
float SpR = (float) Math.random()*100; //eine Zufallszahl zwischen 0 und 1
int RN = 0; //hier wird eine Integer-Zufallszahl reingeschrieben
- if (lebt && (anzNachbarn>=2) && (SpR < spread) && (noNachbarn >=1)) { //wenn eine Zelle lebt, mindestens 2 lebende Nachbarzellen hat, der Spread-Koeffizient größer als die für die Zelle berechnete Zufallszahl und mindestens einen nicht lebenden Nachbarn hat
+ if (lebt && (anzNachbarn>=2) && (SpR < spread) && (noNachbarn >=1)) { //wenn eine Zelle lebt, mindestens 2 lebende Nachbarzellen hat, der Spread-Koeffizient gr��er als die f�r die Zelle berechnete Zufallszahl und mindestens einen nicht lebenden Nachbarn hat
int anzTemp = 0;
int[] nbPossibleUrban = null;
RN = 1 + Math.round((float)Math.random()*(noNachbarn-1));
@@ -474,7 +475,7 @@
nbX = x+NEIGHBOR[nbCellChange][0];
nbY = y+NEIGHBOR[nbCellChange][1];
if ( nbX < areaMinX || nbY < areaMinY || nbX > areaMaxX || nbY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(nbX,nbY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(nbX,nbY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
if (areaRestr.getRasterSampleAsFloat(nbX,nbY) != 0)
continue;
@@ -484,15 +485,15 @@
double slopeDoubleNb = doubleObjNb.doubleValue();
float rasterSample = outputGrid.getRasterSampleAsFloat(nbX,nbY); //holt die Werte aus den jeweiligen Nachbarzellen
if (rasterSample == 0f){ //wenn der Wert 0 ist
- anzTemp++; //wird Anzahl der möglichen Zellen erhöht
+ anzTemp++; //wird Anzahl der m�glichen Zellen erh�ht
nbPossibleUrban = new int[] {nbX,nbY,anzTemp}; //Koordinaten und Nummern dieser Zellen werden in Array geschrieben
int urbanNbTemp = 0;
float NbValueEdge = 1f;
- if (nbPossibleUrban[2] == RN){ //wenn Nummer im "PossibleUrban"-Array der Zufallszahl entspricht, die zwischen 1 und Anzahl der möglichen Zellen liegt...
- //damit die Städte nicht zu sehr "ausfransen" steht eine Zelle nur zur Umwandlung zur Verfügung, wenn auch sie mind. 2 urbane Nachbarn hat
+ if (nbPossibleUrban[2] == RN){ //wenn Nummer im "PossibleUrban"-Array der Zufallszahl entspricht, die zwischen 1 und Anzahl der m�glichen Zellen liegt...
+ //damit die St�dte nicht zu sehr "ausfransen" steht eine Zelle nur zur Umwandlung zur Verf�gung, wenn auch sie mind. 2 urbane Nachbarn hat
urbanNbTemp = calculateNeighbors(nbX,nbY,NbValueEdge);
if (urbanNbTemp >= 2 && tmpGrid[nbX][nbY]==false && slopeDoubleNb < RNEdgeSlope){
- tmpGrid[nbX][nbY] = true; //wird true ins temporäre Raster geschrieben
+ tmpGrid[nbX][nbY] = true; //wird true ins tempor�re Raster geschrieben
anzSpreadTreffer++;
}
}
@@ -510,7 +511,7 @@
int anzGesamt = 0;
int[] cellValue = null;
- //For-Schleife zählt alle als true markierten Zellen im Temp-Raster
+ //For-Schleife z�hlt alle als true markierten Zellen im Temp-Raster
for (int x = 0; x < inputGrid.getWidth();x++)
for(int y = 0; y < inputGrid.getHeight();y++){
int X = inputGrid.getMinX() + x;
@@ -521,7 +522,7 @@
}
int RSearchRoad = 0;
- int r = 1; //Verteile soviel neue Pixel zufällig in geeigneten Bereichen, bis disp_value erreicht ist
+ int r = 1; //Verteile soviel neue Pixel zuf�llig in geeigneten Bereichen, bis disp_value erreicht ist
//Rectangle gridBounds = new Rectangle(0, 0, inputGrid.getWidth(), inputGrid.getHeight()); //ein Rechteck wird definiert
@@ -535,7 +536,7 @@
int X = inputGrid.getMinX() + x;
int Y = inputGrid.getMinY() + y;
if (tmpGrid[X][Y]==true){
- anzTruePixels++; //wird true-Pixel gefunden, wird anzTruePixels hochgezählt
+ anzTruePixels++; //wird true-Pixel gefunden, wird anzTruePixels hochgez�hlt
cellValue = new int[] {X,Y,anzTruePixels}; //und Koordinaten in Array geschrieben
int tempRoadCell[] = null;
int tempNbRoadCell[] = null;
@@ -543,7 +544,7 @@
//statusOut.println(cellValue[0]+","+cellValue[1]+","+cellValue[2]);
//statusOut.println(r+","+RSearchRoad);
r++;
- //JETZT NACH STRAßE SUCHEN!!
+ //JETZT NACH STRA�E SUCHEN!!
float roadValue = roadGrid.getRasterSampleAsFloat(X,Y);
// statusOut.println(roadValue);
if (roadValue > 0.0){
@@ -578,7 +579,7 @@
nbRoadBreedX = nbCellNew[0]+NEIGHBOR[cellBreed][0];
nbRoadBreedY = nbCellNew[1]+NEIGHBOR[cellBreed][1];
if ( nbRoadBreedX < areaMinX || nbRoadBreedY < areaMinY || nbRoadBreedX > areaMaxX || nbRoadBreedY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadBreedX,nbRoadBreedY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadBreedX,nbRoadBreedY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
if (areaRestr.getRasterSampleAsFloat(nbRoadBreedX,nbRoadBreedY) != 0)
continue;
@@ -616,7 +617,7 @@
for (int nbRoadCellsY = Y - roadNeighborhoodRange; nbRoadCellsY <= Y + roadNeighborhoodRange; nbRoadCellsY++){
// if (gridBounds.contains(nbRoadCellsX, nbRoadCellsY))
if ( nbRoadCellsX < areaMinX || nbRoadCellsY < areaMinY || nbRoadCellsX > areaMaxX || nbRoadCellsY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadCellsX,nbRoadCellsY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadCellsX,nbRoadCellsY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
if (areaRestr.getRasterSampleAsFloat(nbRoadCellsX,nbRoadCellsY) != 0)
continue;
@@ -637,7 +638,7 @@
// statusOut.println("TEST-ROAD: "+nbRoadCellsX+","+nbRoadCellsY);
// if (gridBounds.contains(nbRoadCellsX, nbRoadCellsY))
if ( nbRoadCellsX < areaMinX || nbRoadCellsY < areaMinY || nbRoadCellsX > areaMaxX || nbRoadCellsY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadCellsX,nbRoadCellsY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadCellsX,nbRoadCellsY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
if (areaRestr.getRasterSampleAsFloat(nbRoadCellsX,nbRoadCellsY) != 0)
continue;
@@ -678,7 +679,7 @@
nbRoadBreedX = nbCellNew[0]+NEIGHBOR[cellBreed][0];
nbRoadBreedY = nbCellNew[1]+NEIGHBOR[cellBreed][1];
if ( nbRoadBreedX < areaMinX || nbRoadBreedY < areaMinY || nbRoadBreedX > areaMaxX || nbRoadBreedY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadBreedX,nbRoadBreedY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadBreedX,nbRoadBreedY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
if (areaRestr.getRasterSampleAsFloat(nbRoadBreedX,nbRoadBreedY) != 0)
continue;
@@ -736,9 +737,9 @@
boolean lebt = outputGrid.getRasterSampleAsFloat(X , Y ) > 0f; //eine Zelle lebt, wenn sie 1 ist
- boolean road = roadGrid.getRasterSampleAsFloat(X, Y) > 0f; //eine Zelle beinhaltet eine Straße...
- if (tmpGrid[x][y] == false) //wenn im temporären Raster nichts drinsteht...
- tmpGrid[x][y] = lebt; //wird der Wert aus dem Ausgangsraster übernommen
+ boolean road = roadGrid.getRasterSampleAsFloat(X, Y) > 0f; //eine Zelle beinhaltet eine Stra�e...
+ if (tmpGrid[x][y] == false) //wenn im tempor�ren Raster nichts drinsteht...
+ tmpGrid[x][y] = lebt; //wird der Wert aus dem Ausgangsraster �bernommen
if(lebt == true)
thisYear++;
if(road == true)
@@ -802,7 +803,7 @@
if (!anyBodyAlive) {
stepCount = stepNo;
- statusOut.println("Lebt keiner mehr... höre hier auf!");
+ statusOut.println("Lebt keiner mehr... h�re hier auf!");
}
@@ -836,7 +837,7 @@
nbRoadX = X+NEIGHBOR[nbRoadCells][0];
nbRoadY = Y+NEIGHBOR[nbRoadCells][1];
if ( nbRoadX < areaMinX || nbRoadY < areaMinY || nbRoadX > areaMaxX || nbRoadY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadX,nbRoadY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadX,nbRoadY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
//if (areaRestr.getRasterSampleAsFloat(nbRoadX,nbRoadY) != 0)
// continue;
@@ -853,7 +854,7 @@
nbRoadX = X+NEIGHBOR[nbRoadCells][0];
nbRoadY = Y+NEIGHBOR[nbRoadCells][1];
if ( nbRoadX < areaMinX || nbRoadY < areaMinY || nbRoadX > areaMaxX || nbRoadY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadX,nbRoadY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(nbRoadX,nbRoadY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
float roadSample = roadGrid.getRasterSampleAsFloat(nbRoadX,nbRoadY);
if (roadSample > 0f){
@@ -888,7 +889,7 @@
nbUrbanizeX = X+NEIGHBOR[urbanizeCells][0];
nbUrbanizeY = Y+NEIGHBOR[urbanizeCells][1];
if ( nbUrbanizeX < areaMinX || nbUrbanizeY < areaMinY || nbUrbanizeX > areaMaxX || nbUrbanizeY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(nbUrbanizeX,nbUrbanizeY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(nbUrbanizeX,nbUrbanizeY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
if (areaRestr.getRasterSampleAsFloat(nbUrbanizeX,nbUrbanizeY) != 0)
continue;
@@ -933,7 +934,7 @@
nbX = X+NEIGHBOR[nbCells][0];
nbY = Y+NEIGHBOR[nbCells][1];
if ( nbX < areaMinX || nbY < areaMinY || nbX > areaMaxX || nbY > areaMaxY ||
- Float.isNaN(outputGrid.getRasterSampleAsFloat(nbX,nbY)) ) //wenn Nachbarzelle außerhalb des Rasters (NaN) --> ignorieren
+ Float.isNaN(outputGrid.getRasterSampleAsFloat(nbX,nbY)) ) //wenn Nachbarzelle au�erhalb des Rasters (NaN) --> ignorieren
continue;
if (areaRestr.getRasterSampleAsFloat(nbX,nbY) != 0)
continue;
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModifyingContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModifyingContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModelSelfModifyingContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,7 +1,7 @@
package edu.bonn.xulu.plugin.model.sleuth;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.DefaultModelResource;
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModel_MC.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModel_MC.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModel_MC.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,8 +1,8 @@
package edu.bonn.xulu.plugin.model.sleuth;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.ScalarProperty;
import edu.bonn.xulu.model.XuluModel;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModel_MC_ContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModel_MC_ContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/sleuth/UrbanGrowthModel_MC_ContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -1,6 +1,6 @@
package edu.bonn.xulu.plugin.model.sleuth;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.ModelResource;
import edu.bonn.xulu.model.ValuePropertyResource;
Modified: trunk/src/edu/bonn/xulu/plugin/model/test/TestModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/test/TestModel.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/model/test/TestModel.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,10 +13,10 @@
import java.awt.image.DataBuffer;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.temp.BaseTypeUtil;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.temp.BaseTypeUtil;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.AbstractStepModel;
Modified: trunk/src/edu/bonn/xulu/plugin/vis/GTEditorTool.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/vis/GTEditorTool.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/vis/GTEditorTool.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -15,14 +15,14 @@
import org.geotools.map.MapLayer;
import org.geotools.styling.Style;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.geotools.gui.GeoMapPane;
-import schmitzm.geotools.gui.JMapEditorPane;
-import schmitzm.geotools.gui.LayeredEditorFrame;
-import schmitzm.geotools.gui.LayeredMapPane;
-import schmitzm.geotools.map.event.JMapPaneListener;
-import schmitzm.geotools.map.event.LayerEditFinishedEvent;
-import schmitzm.geotools.gui.XMapPaneEvent;
+import de.schmitzm.data.property.ValueProperty;
+import de.schmitzm.geotools.gui.GeoMapPane;
+import de.schmitzm.geotools.gui.JMapEditorPane;
+import de.schmitzm.geotools.gui.LayeredEditorFrame;
+import de.schmitzm.geotools.gui.LayeredMapPane;
+import de.schmitzm.geotools.gui.XMapPaneEvent;
+import de.schmitzm.geotools.map.event.JMapPaneListener;
+import de.schmitzm.geotools.map.event.LayerEditFinishedEvent;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.appl.XuluConstants;
Modified: trunk/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -20,26 +20,26 @@
import org.geotools.map.MapLayer;
import org.geotools.styling.Style;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
-import schmitzm.data.WritableGridRaster;
-import schmitzm.data.event.NameChangeEvent;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectTraceable;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.geotools.grid.GridUtil;
-import schmitzm.geotools.gui.LayeredMapFrame;
-import schmitzm.geotools.gui.LayeredMapPane;
-import skrueger.geotools.StyledLayerStyle;
import appl.data.DataProxy;
import appl.data.LateLoadingProxy;
-import appl.data.LoadingException;
+import de.appl.data.LoadingException;
+import de.schmitzm.data.event.NameChangeEvent;
+import de.schmitzm.data.event.ObjectEvent;
+import de.schmitzm.data.event.ObjectListener;
+import de.schmitzm.data.event.ObjectTraceable;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.Properties;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ValueProperty;
+import de.schmitzm.geotools.data.WritableGrid;
+import de.schmitzm.geotools.data.WritableGridArray;
+import de.schmitzm.geotools.data.WritableGridRaster;
+import de.schmitzm.geotools.grid.GridUtil;
+import de.schmitzm.geotools.gui.LayeredMapFrame;
+import de.schmitzm.geotools.gui.LayeredMapPane;
+import de.schmitzm.geotools.styling.StyledLayerStyle;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.VisualisationTool;
import edu.bonn.xulu.appl.VisualisationUpdateListener;
Modified: trunk/src/edu/bonn/xulu/plugin/vis/JFreeChartVisualisationTool.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/vis/JFreeChartVisualisationTool.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/edu/bonn/xulu/plugin/vis/JFreeChartVisualisationTool.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -12,7 +12,7 @@
package edu.bonn.xulu.plugin.vis;
import static edu.bonn.xulu.appl.XuluConstants.XULU_VIS_RES;
-import static schmitzm.jfree.JFreeChartUtil.RESOURCE;
+import static de.schmitzm.jfree.JFreeChartUtil.RESOURCE;
import java.awt.BorderLayout;
import java.awt.Container;
@@ -47,17 +47,17 @@
import org.jfree.data.xy.DefaultTableXYDataset;
import org.jfree.data.xy.XYSeries;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.swing.ButtonGroup;
-import schmitzm.swing.JPanel;
-import schmitzm.swing.MultiSplitPane;
-import schmitzm.swing.table.AbstractMutableTableModel;
-import schmitzm.swing.table.MutableTable;
+import de.schmitzm.data.property.ListProperty;
+import de.schmitzm.data.property.ListPropertyReadAccess;
+import de.schmitzm.data.property.MatrixProperty;
+import de.schmitzm.data.property.Property;
+import de.schmitzm.data.property.PropertyReadAccess;
+import de.schmitzm.data.property.ValueProperty;
+import de.schmitzm.swing.ButtonGroup;
+import de.schmitzm.swing.JPanel;
+import de.schmitzm.swing.MultiSplitPane;
+import de.schmitzm.swing.table.AbstractMutableTableModel;
+import de.schmitzm.swing.table.MutableTable;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.VisualisationTool;
import edu.bonn.xulu.appl.VisualisationUpdateListener;
Modified: trunk/src/skrueger/gol/GameOfLife.java
===================================================================
--- trunk/src/skrueger/gol/GameOfLife.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/skrueger/gol/GameOfLife.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -13,8 +13,8 @@
import java.awt.image.DataBuffer;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.model.AbstractStepModel;
public class GameOfLife extends AbstractStepModel {
Modified: trunk/src/skrueger/gol/GameOfLifeContentManager.java
===================================================================
--- trunk/src/skrueger/gol/GameOfLifeContentManager.java 2011-01-27 18:45:46 UTC (rev 113)
+++ trunk/src/skrueger/gol/GameOfLifeContentManager.java 2011-07-11 11:31:25 UTC (rev 114)
@@ -11,8 +11,8 @@
package skrueger.gol;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ScalarProperty;
+import de.schmitzm.data.property.ScalarProperty;
+import de.schmitzm.geotools.data.WritableGrid;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.ValuePropertyResource;
More information about the Xulu-commits
mailing list