[Xulu-commits] r78 - in trunk: defaults lib lib/geotoolsArcGrid lib/jai-1_1_3/lib lib/schmitzm src/appl/data src/appl/ext src/appl/parallel 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/event src/appl/parallel/gui src/appl/parallel/model src/appl/parallel/plugin/event src/appl/parallel/server src/appl/parallel/services src/appl/parallel/spmd src/appl/parallel/spmd/split src/appl/parallel/starter/client 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/grid src/edu/bonn/xulu/plugin/data/misc 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/parallel src/edu/bonn/xulu/plugin/model/parallel/demo src/edu/bonn/xulu/plugin/model/test src/edu/bonn/xulu/plugin/vis
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Feb 10 17:44:02 CET 2010
Author: alfonx
Date: 2010-02-10 17:43:46 +0100 (Wed, 10 Feb 2010)
New Revision: 78
Added:
trunk/lib/gt2-2.6/
trunk/lib/schmitzm/schmitzm-2.0.jar
Removed:
trunk/lib/geotoolsArcGrid/gt2-arcgrid-2.3.0-M0.jar
trunk/lib/gt2-2.4.5/
trunk/lib/jai-1_1_3/lib/jai_codec.jar
trunk/lib/jai-1_1_3/lib/jai_imageio.jar
trunk/lib/schmitzm/schmitzm-1.1.jar
Modified:
trunk/defaults/.classpath
trunk/defaults/startXULU.bat
trunk/src/appl/data/SerializedDataLoader.java
trunk/src/appl/data/WritableGridLLProxy.java
trunk/src/appl/ext/ConfigurationEditor.java
trunk/src/appl/ext/ConfigurationEditorEngine.java
trunk/src/appl/ext/ConfigurationEditorGUI.java
trunk/src/appl/ext/ConfigurationEditorPlugin.java
trunk/src/appl/ext/XuluConfig.java
trunk/src/appl/parallel/ComputingResource.java
trunk/src/appl/parallel/client/ClientDataServer.java
trunk/src/appl/parallel/client/DataServer.java
trunk/src/appl/parallel/client/RemoteEventHandler.java
trunk/src/appl/parallel/client/RemoteExecutionController.java
trunk/src/appl/parallel/data/AbstractDataHandler.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/BufferedHelper.java
trunk/src/appl/parallel/data/xulugridfile/XuluGridFileConverter.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/event/CommEventSink.java
trunk/src/appl/parallel/event/SimpleConsoleMonitor.java
trunk/src/appl/parallel/gui/ModelControlContainer_parallel.java
trunk/src/appl/parallel/gui/ModelControlFrame_Tabbed.java
trunk/src/appl/parallel/gui/ModelControlFrame_parallel.java
trunk/src/appl/parallel/gui/ParallelControlPanel.java
trunk/src/appl/parallel/gui/ParallelControlPanelEngine.java
trunk/src/appl/parallel/gui/SimplePropertyTable.java
trunk/src/appl/parallel/model/AbstractParallelStepModel.java
trunk/src/appl/parallel/model/ParallelStepModel.java
trunk/src/appl/parallel/plugin/event/SimpleCommEventMonitor.java
trunk/src/appl/parallel/plugin/event/SimpleCommEventMonitorPlugin.java
trunk/src/appl/parallel/server/PartitionDataManager.java
trunk/src/appl/parallel/server/SPMDResource.java
trunk/src/appl/parallel/server/ServerMulticastReceiver.java
trunk/src/appl/parallel/server/XuluServer.java
trunk/src/appl/parallel/server/XuluServerProperties.java
trunk/src/appl/parallel/services/GlobalDiscoveryService.java
trunk/src/appl/parallel/services/HostnameDiscoveryService.java
trunk/src/appl/parallel/services/MulticastDiscoveryService.java
trunk/src/appl/parallel/services/RemoteEventProxy.java
trunk/src/appl/parallel/spmd/AdvancedSPMDClientInterface.java
trunk/src/appl/parallel/spmd/AdvancedSPMDServerController.java
trunk/src/appl/parallel/spmd/AdvancedSPMDServerInterface.java
trunk/src/appl/parallel/spmd/MultiDataInfo.java
trunk/src/appl/parallel/spmd/MultiDataObject.java
trunk/src/appl/parallel/spmd/MultiDataPartitionObject.java
trunk/src/appl/parallel/spmd/SPMDClientController.java
trunk/src/appl/parallel/spmd/SPMDServerController.java
trunk/src/appl/parallel/spmd/SPMDServerInterface.java
trunk/src/appl/parallel/spmd/SPMDTask.java
trunk/src/appl/parallel/spmd/split/AbstractSplitMap.java
trunk/src/appl/parallel/spmd/split/SinglePartitionInfo.java
trunk/src/appl/parallel/spmd/split/SplitMap.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/SplittableResource.java
trunk/src/appl/parallel/starter/client/XuluStarterClientPanel.java
trunk/src/appl/parallel/starter/client/XuluStarterController.java
trunk/src/appl/parallel/starter/client/XuluStarterControllerPlugin.java
trunk/src/appl/parallel/starter/server/XuluServerStarter.java
trunk/src/appl/parallel/starter/server/XuluStarterServerGUI.java
trunk/src/appl/parallel/test/MulticastSocketTest.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/test/XuluServerTest.java
trunk/src/appl/parallel/test/generalTestClass.java
trunk/src/appl/parallel/thread/ExecutionThread.java
trunk/src/appl/parallel/util/Helper.java
trunk/src/appl/parallel/util/PartitionUtil.java
trunk/src/appl/plugin/multimodelcontrol/MultiModelControlFrame.java
trunk/src/appl/plugin/multimodelcontrol/MultiModelControlHandler.java
trunk/src/appl/plugin/multimodelcontrol/MultiModelControlPlugin.java
trunk/src/appl/util/GeneralUtil.java
trunk/src/appl/util/RasterUtil.java
trunk/src/appl/util/XuluFrameAdapter.java
trunk/src/appl/util/benchmark/SimpleBenchmark.java
trunk/src/de/skrueger/xulu/plugin/gnur/RVarSingleGrid.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/AbstractScriptInterpreter.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/HandlerFactory.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/ScriptablePlugin.java
trunk/src/edu/bonn/xulu/appl/VisualisationManager.java
trunk/src/edu/bonn/xulu/appl/VisualisationTool.java
trunk/src/edu/bonn/xulu/appl/VisualisationUpdateListener.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/appl/XuluRegistryReader.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/AbstractManagerFrame.java
trunk/src/edu/bonn/xulu/gui/DataPoolFrame.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/ModelControlFrame.java
trunk/src/edu/bonn/xulu/gui/ModelManagerTreeModel.java
trunk/src/edu/bonn/xulu/gui/ObjectOrModelInputOption.java
trunk/src/edu/bonn/xulu/gui/StatusFrame.java
trunk/src/edu/bonn/xulu/gui/XuluGUIMessages.java
trunk/src/edu/bonn/xulu/gui/XuluGUIUtil.java
trunk/src/edu/bonn/xulu/gui/XuluInternalFrame.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/AbstractFactory.java
trunk/src/edu/bonn/xulu/io/ExportFactory.java
trunk/src/edu/bonn/xulu/io/Factory.java
trunk/src/edu/bonn/xulu/io/FactoryCanceledException.java
trunk/src/edu/bonn/xulu/io/IODefinition.java
trunk/src/edu/bonn/xulu/io/ImportFactory.java
trunk/src/edu/bonn/xulu/io/TypeMapping.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/DefaultModelResource.java
trunk/src/edu/bonn/xulu/model/ModelContentManager.java
trunk/src/edu/bonn/xulu/model/ModelResource.java
trunk/src/edu/bonn/xulu/model/PropertiesResource.java
trunk/src/edu/bonn/xulu/model/StepModelThread.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/ModelDisposedEvent.java
trunk/src/edu/bonn/xulu/model/event/ModelEvent.java
trunk/src/edu/bonn/xulu/model/event/ModelInitialisedEvent.java
trunk/src/edu/bonn/xulu/model/event/ModelListener.java
trunk/src/edu/bonn/xulu/model/event/ModelStartedEvent.java
trunk/src/edu/bonn/xulu/model/event/ModelStoppedEvent.java
trunk/src/edu/bonn/xulu/model/event/StepModelAdapter.java
trunk/src/edu/bonn/xulu/plugin/appl/AbstractMenuPlugin.java
trunk/src/edu/bonn/xulu/plugin/appl/DataExportHandler.java
trunk/src/edu/bonn/xulu/plugin/appl/DataExportHandlerFactory.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/GeoModelCodeGeneratorPlugin.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/RasterCalculatorPlugin.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/grid/MultiGrid.java
trunk/src/edu/bonn/xulu/plugin/data/grid/SingleGrid.java
trunk/src/edu/bonn/xulu/plugin/data/misc/CASettlementArea.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.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/parallel/ClueModelContentManager.java
trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelParallel.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/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
Log:
Merged branch 1.8-gt2-2.6 to trunk. Now the trunk is based on GeoTools 2.6.1 and schmitzm-2.0.x
Modified: trunk/defaults/.classpath
===================================================================
--- trunk/defaults/.classpath 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/defaults/.classpath 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,50 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry excluding="**/.svn/" kind="src" path="src"/>
<classpathentry kind="lib" path="resource"/>
- <classpathentry kind="lib" path="lib/schmitzm/schmitzm-1.1.jar"/>
- <classpathentry kind="lib" path="lib/geotoolsArcGrid/gt2-arcgrid-2.3.0-M0.jar" sourcepath="C:/Programme/JavaSrc/gt2-2.3.0-M0-src.zip"/>
- <classpathentry kind="lib" path="lib/JavaRInterface/JRI.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/schmitzm/schmitzm-1.0-gt2-2.6.jar"/>
<classpathentry kind="lib" path="lib/geotoolsArcGrid/junit-4.4.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="lib" path="lib/jini/lib/tools.jar"/>
- <classpathentry kind="lib" path="lib/jini/lib/jini-ext.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-anim-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-awt-util-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-bridge-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-css-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-dom-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-ext-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-gvt-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-parser-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-script-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-svg-dom-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-svggen-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-transcoder-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-util-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/batik-xml-1.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/commons-beanutils-1.7.0.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/commons-io-1.4.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/geoapi-2.3-M1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/geoapi-pending-2.3-M1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-api-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-arcgrid-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-brewer-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-coverage-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-epsg-hsql-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-geotiff-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-image-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-imageio-ext-gdal-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-imagemosaic-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-imagepyramid-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-legacy-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-main-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-metadata-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-referencing-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-render-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-shapefile-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-shapefile-renderer-2.6-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/gt-swing-2.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/hsqldb-1.8.0.7.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-arcgrid-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-customstreams-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-gdal-bindings-1.4.5b.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-gdaldted-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-gdalecw-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-gdalecwjp2-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-gdalehdr-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-gdalerdasimg-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-gdalframework-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-gdalkakadujp2-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-gdalmrsid-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-gdalmrsidjp2-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-gdalnitf-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-geocore-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-imagereadmt-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-tiff-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/imageio-ext-utilities-1.0.5.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/jai_codec-1.1.3.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/jai_imageio-1.1.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/jdom-1.0.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/jsr-275-1.0-beta-2.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/jts-1.10.jar"/>
+ <classpathentry kind="lib" path="lib/gt2-2.6/vecmath-1.3.2.jar"/>
<classpathentry kind="lib" path="lib/jai-1_1_3/lib/clibwrapper_jiio.jar"/>
- <classpathentry kind="lib" path="lib/jai-1_1_3/lib/jai_codec.jar"/>
<classpathentry kind="lib" path="lib/jai-1_1_3/lib/jai_core.jar"/>
- <classpathentry kind="lib" path="lib/jai-1_1_3/lib/jai_imageio.jar"/>
<classpathentry kind="lib" path="lib/jai-1_1_3/lib/mlibwrapper_jai.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/commons-beanutils-1.7.0.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/commons-logging-1.1.1.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/geoapi-nogenerics-2.1.0.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-api-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-arcgrid-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-arcsde-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-brewer-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-coverage-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-coverageio-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-epsg-hsql-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-epsg-wkt-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-geotiff-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-image-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-imagemosaic-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-imagepyramid-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-main-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-mappane-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-metadata-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-referencing-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-render-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-shapefile-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-shapefile-renderer-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/gt2-widgets-swing-2.4.5.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/hsqldb-1.8.0.7.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/jaxb-impl-1.3.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/jdom-1.0.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/jsr108-0.01.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/jts-1.8.jar"/>
- <classpathentry kind="lib" path="lib/gt2-2.4.5/vecmath-1.3.1.jar"/>
+ <classpathentry kind="lib" path="lib/JavaRInterface/JRI.jar"/>
<classpathentry kind="lib" path="lib/jFreeChart/jcommon-1.0.16.jar"/>
- <classpathentry kind="lib" path="lib/jFreeChart/jfreechart-1.0.13.jar" sourcepath="C:/Programme/JavaSrc/jfreechart-1.0.13.zip"/>
+ <classpathentry kind="lib" path="lib/jFreeChart/jfreechart-1.0.13.jar"/>
+ <classpathentry kind="lib" path="lib/jini/lib/jini-ext.jar"/>
+ <classpathentry kind="lib" path="lib/jini/lib/tools.jar"/>
+ <classpathentry kind="lib" path="lib/log4j-1.2.14/log4j-1.2.14.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: trunk/defaults/startXULU.bat
===================================================================
--- trunk/defaults/startXULU.bat 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/defaults/startXULU.bat 2010-02-10 16:43:46 UTC (rev 78)
@@ -57,9 +57,7 @@
set LIB_ROOT=%SCHMITZM_LIB_ROOT%
rem ##### Where to find "GeoTools" #####
-set GT_ROOT=%LIB_ROOT%\gt2-2.4.5
-rem ##### Where to find gt2-arcgrid-2.1.x.jar (from SpearfishDemo) #####
-set GT_ARCGRID_ROOT=%LIB_ROOT%\geotoolsArcGrid
+set GT_ROOT=%LIB_ROOT%\gt2-2.6
rem ##### Where to find "Log4j" #####
set LOG4J_ROOT=%LIB_ROOT%\log4j-1.2.14
@@ -72,7 +70,6 @@
rem ##### combine the external libs #####
set GT_LIB=%GT_ROOT%\*
-set GT_LIB=%GT_LIB%;%GT_ARCGRID_ROOT%\gt2-arcgrid-2.3.0-M0.jar;%GT_ARCGRID_ROOT%\junit-4.4.jar
set LOG4J_LIB=%LOG4J_ROOT%\log4j-1.2.14.jar
set JINI_LIB=%JINI_ROOT%\lib\*
rem set JINI_LIB=%JINI_ROOT%\lib\*;%JINI_ROOT%\lib-dl\*;%JINI_ROOT%\lib-ext\*
Deleted: trunk/lib/geotoolsArcGrid/gt2-arcgrid-2.3.0-M0.jar
===================================================================
(Binary files differ)
Copied: trunk/lib/gt2-2.6 (from rev 73, branches/1.8-gt2-2.6/lib/gt2-2.6)
Deleted: trunk/lib/jai-1_1_3/lib/jai_codec.jar
===================================================================
(Binary files differ)
Deleted: trunk/lib/jai-1_1_3/lib/jai_imageio.jar
===================================================================
(Binary files differ)
Deleted: trunk/lib/schmitzm/schmitzm-1.1.jar
===================================================================
(Binary files differ)
Added: trunk/lib/schmitzm/schmitzm-2.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/schmitzm/schmitzm-2.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/src/appl/data/SerializedDataLoader.java
===================================================================
--- trunk/src/appl/data/SerializedDataLoader.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/data/SerializedDataLoader.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -9,8 +9,6 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import schmitzm.data.WritableGrid;
-
/**
* @author Dominik Appl
*/
Modified: trunk/src/appl/data/WritableGridLLProxy.java
===================================================================
--- trunk/src/appl/data/WritableGridLLProxy.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/data/WritableGridLLProxy.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,14 +1,12 @@
package appl.data;
-import java.awt.Rectangle;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
import appl.util.RasterMetaData;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
/**
* This is an a late loading implementation for {@link WritableGrid WritableGrids}.
Modified: trunk/src/appl/ext/ConfigurationEditor.java
===================================================================
--- trunk/src/appl/ext/ConfigurationEditor.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/ext/ConfigurationEditor.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,11 +1,9 @@
package appl.ext;
-import javax.swing.SwingUtilities;
-import java.awt.BorderLayout;
-import javax.swing.JPanel;
import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
import javax.swing.WindowConstants;
-import java.awt.Dimension;
/**
* Displays the {@link XuluConfig} in a frame based using the
@@ -59,4 +57,4 @@
System.exit(0);
}
-} // @jve:decl-index=0:visual-constraint="10,10"
+}
Modified: trunk/src/appl/ext/ConfigurationEditorEngine.java
===================================================================
--- trunk/src/appl/ext/ConfigurationEditorEngine.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/ext/ConfigurationEditorEngine.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -5,7 +5,6 @@
import java.util.Vector;
import javax.swing.DefaultListModel;
-import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JTable;
import javax.swing.event.ListSelectionEvent;
@@ -14,15 +13,9 @@
import javax.swing.event.TableModelListener;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableModel;
import appl.util.NonEditableTableModel;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.gui.XuluInternalFrame;
-import edu.bonn.xulu.plugin.appl.AbstractMenuPlugin;
-
/**
* Handles the {@link ConfigurationEditorGUI}. The prefixes of the
* {@link XuluConfig} are added to the {@link JList} and the suffixes to the
Modified: trunk/src/appl/ext/ConfigurationEditorGUI.java
===================================================================
--- trunk/src/appl/ext/ConfigurationEditorGUI.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/ext/ConfigurationEditorGUI.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,28 +1,17 @@
package appl.ext;
-import java.awt.BorderLayout;
-import javax.swing.JPanel;
-import javax.swing.JFrame;
import java.awt.Dimension;
-import javax.swing.JList;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.BoxLayout;
-
-import edu.bonn.xulu.gui.XuluInternalFrame;
-
-import java.awt.FlowLayout;
-import java.awt.GridLayout;
-import java.awt.GridBagLayout;
import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
import java.awt.Insets;
-import javax.swing.ListSelectionModel;
+
import javax.swing.JLabel;
-import javax.swing.border.SoftBevelBorder;
-import javax.swing.BorderFactory;
-import javax.swing.border.BevelBorder;
-import javax.swing.JTextField;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
import javax.swing.JTextArea;
+import javax.swing.ListSelectionModel;
import javax.swing.SwingConstants;
/**
@@ -269,4 +258,4 @@
return jPanel2;
}
-} // @jve:decl-index=0:visual-constraint="10,10"
+}
Modified: trunk/src/appl/ext/ConfigurationEditorPlugin.java
===================================================================
--- trunk/src/appl/ext/ConfigurationEditorPlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/ext/ConfigurationEditorPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,12 +1,9 @@
package appl.ext;
-import java.util.ResourceBundle;
-
+import static edu.bonn.xulu.appl.XuluConstants.XULUGUI_RES;
import appl.util.XuluFrameAdapter;
-import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.gui.XuluInternalFrame;
import edu.bonn.xulu.plugin.appl.AbstractMenuPlugin;
-import static edu.bonn.xulu.appl.XuluConstants.XULUGUI_RES;
/**
* The configuration plug-in.
*
Modified: trunk/src/appl/ext/XuluConfig.java
===================================================================
--- trunk/src/appl/ext/XuluConfig.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/ext/XuluConfig.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -6,14 +6,10 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.Properties;
import java.util.Set;
-import java.util.SortedSet;
import java.util.TreeSet;
-import org.geotools.io.DefaultFileFilter;
-
/**
* Simple Property store, which is loaded at each Xulu start and saved at each
* Xulu exit. Every class or plugin can store and retrieve configuration
Modified: trunk/src/appl/parallel/ComputingResource.java
===================================================================
--- trunk/src/appl/parallel/ComputingResource.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/ComputingResource.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,17 +1,10 @@
package appl.parallel;
import java.rmi.RemoteException;
-import java.util.HashMap;
-import java.util.Vector;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.gui.ModelControlFrame;
-import appl.parallel.spmd.SPMDTask;
-import appl.parallel.spmd.split.SinglePartitionInfo;
-import appl.parallel.spmd.split.SplitMap;
-import appl.parallel.spmd.split.SplittableResource;
-
/**
* This is the base class for remote computing resources, which could be
* displayed e.g. in the {@link ModelControlFrame} of the
Modified: trunk/src/appl/parallel/client/ClientDataServer.java
===================================================================
--- trunk/src/appl/parallel/client/ClientDataServer.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/client/ClientDataServer.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -3,32 +3,26 @@
import java.awt.Rectangle;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.rmi.AccessException;
-import java.rmi.NotBoundException;
-import java.rmi.Remote;
import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
import java.rmi.server.ServerNotActiveException;
import java.rmi.server.UnicastRemoteObject;
import java.util.HashMap;
import java.util.Hashtable;
+import javax.activation.DataHandler;
+
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import appl.ext.XuluConfig;
-import appl.parallel.event.CommEvent;
import appl.parallel.event.CommEventSink;
import appl.parallel.event.TransferEvent;
import appl.parallel.event.CommEvent.CommType;
-import appl.parallel.spmd.split.DataPartition;
-import appl.parallel.util.Helper;
-// fuer Doku
-import javax.activation.DataHandler;
import appl.parallel.server.PartitionDataServer;
import appl.parallel.server.XuluServer;
+import appl.parallel.spmd.split.DataPartition;
import appl.parallel.spmd.split.SplittableResource;
+import appl.parallel.util.Helper;
/**
* This class is used for storing all data which is needed for parallelization
Modified: trunk/src/appl/parallel/client/DataServer.java
===================================================================
--- trunk/src/appl/parallel/client/DataServer.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/client/DataServer.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -4,9 +4,6 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
-import appl.parallel.event.CommEvent;
-import appl.parallel.event.CommEventSink;
-import appl.parallel.server.PartitionDataServer;
import appl.parallel.spmd.split.DataPartition;
import appl.parallel.spmd.split.SplittableResource;
Modified: trunk/src/appl/parallel/client/RemoteEventHandler.java
===================================================================
--- trunk/src/appl/parallel/client/RemoteEventHandler.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/client/RemoteEventHandler.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,6 +1,5 @@
package appl.parallel.client;
-import java.rmi.Remote;
import java.rmi.RemoteException;
import java.rmi.server.UnicastRemoteObject;
import java.util.Vector;
@@ -9,10 +8,8 @@
import org.apache.log4j.Logger;
import appl.ext.XuluConfig;
-import appl.parallel.event.CommEvent;
import appl.parallel.event.CommEventSink;
import appl.parallel.event.RemoteEvent;
-import appl.parallel.event.RemoteEventSink;
import appl.parallel.event.TimeEvent;
import appl.parallel.event.TimeMonitor;
import appl.parallel.event.TransferEvent;
Modified: trunk/src/appl/parallel/client/RemoteExecutionController.java
===================================================================
--- trunk/src/appl/parallel/client/RemoteExecutionController.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/client/RemoteExecutionController.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,35 +2,27 @@
import java.io.IOException;
import java.rmi.RemoteException;
-import java.util.Iterator;
import java.util.Vector;
-import javax.swing.JOptionPane;
-
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import org.apache.log4j.lf5.StartLogFactor5;
-import com.sun.jini.tool.ClassServer;
-
+import schmitzm.lang.AbstractNamedObject;
import appl.ext.XuluConfig;
-import appl.parallel.ComputingResource;
import appl.parallel.ComputingResourceContainer;
-import appl.parallel.ComputingResourceProperties;
import appl.parallel.model.ParallelStepModel;
import appl.parallel.server.XuluServer;
-import appl.parallel.services.DiscoveryService;
import appl.parallel.services.GlobalDiscoveryService;
import appl.parallel.spmd.AdvancedSPMDClientController;
import appl.parallel.spmd.SPMDClientController;
import appl.parallel.spmd.SPMDClientInterface;
import appl.parallel.spmd.split.SplitMap;
import appl.parallel.util.Helper;
+
+import com.sun.jini.tool.ClassServer;
+
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluPlugin;
-import edu.bonn.xulu.model.AbstractStepModel;
-import edu.bonn.xulu.model.XuluModel;
-import schmitzm.lang.AbstractNamedObject;
/**
* This plugin is responsible that all services required for remote
Modified: trunk/src/appl/parallel/data/AbstractDataHandler.java
===================================================================
--- trunk/src/appl/parallel/data/AbstractDataHandler.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/AbstractDataHandler.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -3,15 +3,11 @@
import java.awt.Rectangle;
import java.io.IOException;
import java.io.Serializable;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.rmi.Naming;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import appl.data.LoadingException;
-import appl.parallel.client.DataServer;
import appl.parallel.client.ClientDataServer;
import appl.parallel.spmd.split.DataPartition;
import appl.parallel.spmd.split.SplittableResource;
Modified: trunk/src/appl/parallel/data/WritableGridArrayPartition.java
===================================================================
--- trunk/src/appl/parallel/data/WritableGridArrayPartition.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/WritableGridArrayPartition.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,16 +1,14 @@
package appl.parallel.data;
import java.awt.Rectangle;
-import java.awt.image.DataBuffer;
+import schmitzm.data.WritableGrid;
+import schmitzm.data.WritableGridArray;
import appl.data.DataProxy;
-import appl.parallel.server.XuluServer;
import appl.parallel.spmd.split.DataPartition;
import appl.parallel.spmd.split.WritableGridPartition;
import appl.parallel.util.PartitionUtil;
import appl.util.RasterMetaData;
-import schmitzm.data.WritableGrid;
-import schmitzm.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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/XuluClientLoader.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,15 +1,11 @@
package appl.parallel.data;
import java.awt.Rectangle;
-import java.awt.geom.Rectangle2D;
import java.io.IOException;
import java.io.Serializable;
import java.net.InetAddress;
-import java.net.MalformedURLException;
import java.net.UnknownHostException;
import java.rmi.Naming;
-import java.rmi.NotBoundException;
-import java.rmi.RemoteException;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
@@ -17,11 +13,8 @@
import appl.data.LoadingException;
import appl.parallel.client.ClientDataServer;
import appl.parallel.client.DataServer;
-import appl.parallel.server.XuluServer;
import appl.parallel.spmd.split.DataPartition;
-import schmitzm.data.WritableGrid;
-
/**
* 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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/splittable/GridListFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,9 +1,7 @@
package appl.parallel.data.splittable;
-import edu.bonn.xulu.io.InstantiationFactory;
-
-// nur fuer Doku
import schmitzm.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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/splittable/GridListFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,23 +2,18 @@
import java.io.File;
-import appl.data.DataProxy;
-import appl.data.WritableGridLLProxy;
-import appl.ext.XuluConfig;
-import appl.util.RasterUtil;
-
-import schmitzm.io.IOUtil;
import schmitzm.data.WritableGridArray;
import schmitzm.data.property.ListProperty;
import schmitzm.data.property.ListPropertyReadAccess;
-
-import edu.bonn.xulu.io.Factory;
+import schmitzm.io.IOUtil;
+import appl.data.DataProxy;
+import appl.ext.XuluConfig;
+import appl.util.RasterUtil;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.GridList;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_ArcInfoAsciiGrid;
Modified: trunk/src/appl/parallel/data/splittable/MultiGridFactory.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/MultiGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/splittable/MultiGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,9 +1,8 @@
package appl.parallel.data.splittable;
-import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-// nur fuer Doku
import schmitzm.data.WritableGrid;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
+import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
/**
* Diese Factory erzeugt Standard-Instanzen von {@link MultiGrid} mit
Modified: trunk/src/appl/parallel/data/splittable/MultiGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/MultiGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/splittable/MultiGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,26 +2,16 @@
import java.io.File;
-import appl.data.WritableGridLLProxy;
+import schmitzm.data.WritableGrid;
import appl.ext.XuluConfig;
import appl.util.RasterUtil;
-
-import schmitzm.data.WritableGrid;
-
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ImportFactory;
-
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import edu.bonn.xulu.plugin.data.grid.GridList;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_ArcInfoAsciiGrid;
-//import edu.bonn.xulu.plugin.io.grid.gt.GridListFactory_ArcInfoAsciiGrid;
-// nur fuer Doku
-import schmitzm.data.WritableGridArray;
-import edu.bonn.xulu.io.InstantiationFactory;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link MultiGrid} aus/in Dateien im ArcInfo-ASCII-Grid-Format.
Modified: trunk/src/appl/parallel/data/splittable/SingleGridFactory.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/SingleGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/splittable/SingleGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,8 +1,7 @@
package appl.parallel.data.splittable;
-import edu.bonn.xulu.io.InstantiationFactory;
-// nur fuer Doku
import schmitzm.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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/splittable/SingleGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,20 +2,15 @@
import java.io.File;
+import schmitzm.data.WritableGridArray;
import appl.data.DataProxy;
-import appl.data.WritableGridLLProxy;
import appl.ext.XuluConfig;
-import appl.util.RasterMetaData;
import appl.util.RasterUtil;
-
-import schmitzm.data.WritableGridArray;
-
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_ArcInfoAsciiGrid;
Modified: trunk/src/appl/parallel/data/splittable/SingleGridFactory_GeoTiff.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/SingleGridFactory_GeoTiff.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/splittable/SingleGridFactory_GeoTiff.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,23 +2,16 @@
import java.io.File;
-import appl.data.DataProxy;
-
-
import schmitzm.data.WritableGridArray;
-
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
+import appl.data.DataProxy;
+import appl.data.WritableGridLLProxy;
import edu.bonn.xulu.appl.XuluRegistry;
-
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_GeoTiff;
-// nur fuer Doku
-import appl.data.WritableGridLLProxy;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link SingleGrid} aus/in das GeoTiff-Format.
Modified: trunk/src/appl/parallel/data/splittable/SplittableGridLLFactory.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/SplittableGridLLFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/splittable/SplittableGridLLFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,23 +1,13 @@
package appl.parallel.data.splittable;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.DataBuffer;
-
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import appl.data.WritableGridLLProxy;
import appl.util.RasterMetaData;
-import schmitzm.data.WritableGrid;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
-// nur fuer Doku
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.io.Factory;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-
/**
* Diese Factory erzeugt Standard-Instanzen des Datentyps {@link SplittableLLProxyGrid}.<br>
* <b>Bemerke:</b><br>
Modified: trunk/src/appl/parallel/data/splittable/SplittableLLProxyGrid.java
===================================================================
--- trunk/src/appl/parallel/data/splittable/SplittableLLProxyGrid.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/splittable/SplittableLLProxyGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -8,7 +8,6 @@
import appl.data.WritableGridLLProxy;
import appl.parallel.spmd.split.DataPartition;
import appl.parallel.spmd.split.SplittableGrid;
-import appl.parallel.spmd.split.SplittableResource;
import appl.parallel.spmd.split.WritableGridPartition;
import appl.parallel.util.PartitionUtil;
import appl.util.RasterMetaData;
Modified: trunk/src/appl/parallel/data/xulugridfile/BufferedHelper.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/BufferedHelper.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/xulugridfile/BufferedHelper.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -4,7 +4,6 @@
import java.io.ByteArrayOutputStream;
import java.io.EOFException;
import java.io.IOException;
-// fuer Doku
import java.io.RandomAccessFile;
/**
Modified: trunk/src/appl/parallel/data/xulugridfile/XuluGridFileConverter.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/XuluGridFileConverter.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/xulugridfile/XuluGridFileConverter.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -15,35 +15,23 @@
*
*/
package appl.parallel.data.xulugridfile;
-import org.geotools.gce.arcgrid.ArcGridRaster;
-import org.geotools.resources.NIOUtilities;
+import gtmig.org.geotools.gce.arcgrid.ArcGridRaster;
-import appl.util.RasterMetaData;
-
import java.awt.image.DataBuffer;
-import java.awt.image.Raster;
-import java.awt.image.WritableRaster;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.PrintWriter;
import java.io.RandomAccessFile;
import java.io.Reader;
import java.io.StreamTokenizer;
-import java.net.URL;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.channels.FileChannel;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import javax.media.jai.RasterFactory;
+import appl.util.RasterMetaData;
+
/**
* This class converts a ArcGridInfo_ASCII file to a {@link XuluGridFile}. It directly writes from
* the the ArcGridInfo to the given file. It does not use the memory!
Modified: trunk/src/appl/parallel/data/xulugridfile/XuluWritableGridFile.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/XuluWritableGridFile.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/xulugridfile/XuluWritableGridFile.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -5,12 +5,7 @@
import java.io.FileNotFoundException;
import schmitzm.data.WritableGrid;
-
-import edu.bonn.xulu.appl.XuluRegistry;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
import appl.data.DataLoader;
-import appl.data.WritableGridArrayLoader;
import appl.data.WritableGridLLProxy;
import appl.parallel.spmd.split.DataPartition;
import appl.parallel.spmd.split.SplittableGrid;
Modified: trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,9 +1,7 @@
package appl.parallel.data.xulugridfile.factories;
-import edu.bonn.xulu.io.InstantiationFactory;
-
-// nur fuer Doku
import schmitzm.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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/GridListFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,9 +1,13 @@
package appl.parallel.data.xulugridfile.factories;
import java.io.File;
-import java.io.FileInputStream;
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;
@@ -11,20 +15,11 @@
import appl.parallel.data.xulugridfile.XuluGridFileConverter;
import appl.parallel.data.xulugridfile.XuluWritableGridFile;
import appl.util.RasterUtil;
-
-import schmitzm.io.IOUtil;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-
-import edu.bonn.xulu.io.Factory;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.GridList;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_ArcInfoAsciiGrid;
Modified: trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,9 +1,8 @@
package appl.parallel.data.xulugridfile.factories;
-import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-// nur fuer Doku
import schmitzm.data.WritableGrid;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
+import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
/**
* Diese Factory erzeugt Standard-Instanzen von {@link MultiGrid} mit
Modified: trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory_ArcInfoAsciiGrid.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/MultiGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,31 +1,21 @@
package appl.parallel.data.xulugridfile.factories;
import java.io.File;
-import java.io.FileInputStream;
-import appl.data.WritableGridLLProxy;
+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 schmitzm.data.WritableGrid;
-
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ImportFactory;
-
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import edu.bonn.xulu.plugin.data.grid.GridList;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_ArcInfoAsciiGrid;
-//import edu.bonn.xulu.plugin.io.grid.gt.GridListFactory_ArcInfoAsciiGrid;
-// nur fuer Doku
-import schmitzm.data.WritableGridArray;
-import edu.bonn.xulu.io.InstantiationFactory;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link MultiGrid} aus/in Dateien im ArcInfo-ASCII-Grid-Format.
Modified: trunk/src/appl/parallel/data/xulugridfile/factories/SingleGridFactory.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/SingleGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/SingleGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,8 +1,7 @@
package appl.parallel.data.xulugridfile.factories;
-import edu.bonn.xulu.io.InstantiationFactory;
-// nur fuer Doku
import schmitzm.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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/SingleGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,27 +1,21 @@
package appl.parallel.data.xulugridfile.factories;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
+import schmitzm.data.WritableGrid;
+import schmitzm.data.WritableGridArray;
import appl.data.DataProxy;
-import appl.data.WritableGridLLProxy;
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.RasterMetaData;
import appl.util.RasterUtil;
-
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
-
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_ArcInfoAsciiGrid;
Modified: trunk/src/appl/parallel/data/xulugridfile/factories/XuluGridFactory.java
===================================================================
--- trunk/src/appl/parallel/data/xulugridfile/factories/XuluGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/data/xulugridfile/factories/XuluGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,10 +1,5 @@
package appl.parallel.data.xulugridfile.factories;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.DataBuffer;
-
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import appl.data.WritableGridLLProxy;
@@ -12,15 +7,8 @@
import appl.parallel.data.xulugridfile.XuluGridFile;
import appl.parallel.data.xulugridfile.XuluWritableGridFile;
import appl.util.RasterMetaData;
-import schmitzm.data.WritableGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
-// nur fuer Doku
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.io.Factory;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-
/**
*Creates instances of the memory saving data type {@link XuluGridFile} for the use in the Xulu
*Plattform.
Modified: trunk/src/appl/parallel/event/CommEventSink.java
===================================================================
--- trunk/src/appl/parallel/event/CommEventSink.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/event/CommEventSink.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -3,7 +3,6 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
-//doc
import appl.parallel.client.RemoteEventHandler;
import appl.parallel.services.RemoteEventProxy;
Modified: trunk/src/appl/parallel/event/SimpleConsoleMonitor.java
===================================================================
--- trunk/src/appl/parallel/event/SimpleConsoleMonitor.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/event/SimpleConsoleMonitor.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,8 +1,5 @@
package appl.parallel.event;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
Modified: trunk/src/appl/parallel/gui/ModelControlContainer_parallel.java
===================================================================
--- trunk/src/appl/parallel/gui/ModelControlContainer_parallel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/gui/ModelControlContainer_parallel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,12 +1,8 @@
package appl.parallel.gui;
-import appl.parallel.ComputingResourceContainer;
import appl.parallel.client.RemoteExecutionController;
-import appl.parallel.model.AbstractParallelStepModel;
import appl.parallel.model.ParallelStepModel;
-import appl.parallel.spmd.SPMDClientInterface;
import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.XuluModel;
import edu.bonn.xulu.plugin.gui.ModelControlContainer;
Modified: trunk/src/appl/parallel/gui/ModelControlFrame_Tabbed.java
===================================================================
--- trunk/src/appl/parallel/gui/ModelControlFrame_Tabbed.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/gui/ModelControlFrame_Tabbed.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,20 +1,18 @@
package appl.parallel.gui;
-import java.awt.CardLayout;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
-import javax.swing.BoxLayout;
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
+
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluConstants;
-
+import edu.bonn.xulu.gui.ModelContentManagerContainer;
import edu.bonn.xulu.model.XuluModel;
import edu.bonn.xulu.plugin.gui.ModelControlFrame_Basic;
-import edu.bonn.xulu.gui.ModelContentManagerContainer;
/**
* This class introduces tab functionality into the ModelControlFrame
Modified: trunk/src/appl/parallel/gui/ModelControlFrame_parallel.java
===================================================================
--- trunk/src/appl/parallel/gui/ModelControlFrame_parallel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/gui/ModelControlFrame_parallel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,17 +1,12 @@
package appl.parallel.gui;
-import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import javax.swing.JPanel;
-
import schmitzm.lang.WorkingThread;
import schmitzm.lang.WorkingThreadAdapter;
-
-import appl.parallel.client.RemoteExecutionController;
import appl.parallel.model.AbstractParallelStepModel;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.model.XuluModel;
Modified: trunk/src/appl/parallel/gui/ParallelControlPanel.java
===================================================================
--- trunk/src/appl/parallel/gui/ParallelControlPanel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/gui/ParallelControlPanel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,23 +1,19 @@
package appl.parallel.gui;
-import javax.swing.JPanel;
-import java.awt.GridBagLayout;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JLabel;
-import javax.swing.BoxLayout;
-import javax.swing.ListSelectionModel;
-import java.awt.Insets;
-import javax.swing.border.SoftBevelBorder;
-import javax.swing.table.DefaultTableModel;
-import edu.bonn.xulu.XuluModellingPlatform;
+import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
+import javax.swing.ListSelectionModel;
+import javax.swing.border.SoftBevelBorder;
-import java.awt.Rectangle;
-
/**
* The GUI for the ParallelControlPanel . All the interesting
* stuff happens in the {@link ParallelControlPanelEngine}.
Modified: trunk/src/appl/parallel/gui/ParallelControlPanelEngine.java
===================================================================
--- trunk/src/appl/parallel/gui/ParallelControlPanelEngine.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/gui/ParallelControlPanelEngine.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,7 +2,6 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.Iterator;
import java.util.Vector;
import javax.swing.JOptionPane;
@@ -12,32 +11,17 @@
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import appl.ext.XuluConfig;
-import appl.parallel.ComputingResource;
import appl.parallel.ComputingResourceContainer;
import appl.parallel.ComputingResourceProperties;
import appl.parallel.client.RemoteExecutionController;
import appl.parallel.client.ResourceChangeListener;
import appl.util.NonEditableTableModel;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-
import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.ModelControlManager;
-import edu.bonn.xulu.appl.XuluPlugin;
-import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.gui.ModelContentManagerContainer;
-import edu.bonn.xulu.gui.ModelControlFrame;
-import edu.bonn.xulu.gui.XuluGUIMessages;
-import edu.bonn.xulu.model.ModelContentManager;
-import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.plugin.gui.ModelControlContainer;
-import edu.bonn.xulu.plugin.gui.ModelControlFrame_Basic;
/**
* This class controls the {@link ParallelControlPanel}.
Modified: trunk/src/appl/parallel/gui/SimplePropertyTable.java
===================================================================
--- trunk/src/appl/parallel/gui/SimplePropertyTable.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/gui/SimplePropertyTable.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,7 +1,6 @@
package appl.parallel.gui;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.Properties;
import javax.swing.JTable;
Modified: trunk/src/appl/parallel/model/AbstractParallelStepModel.java
===================================================================
--- trunk/src/appl/parallel/model/AbstractParallelStepModel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/model/AbstractParallelStepModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -5,8 +5,6 @@
import appl.parallel.spmd.SPMDClientInterface;
import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.ModelContentManager;
-import edu.bonn.xulu.model.event.ModelStepFinishedEvent;
-import edu.bonn.xulu.model.event.ModelStepStartedEvent;
/**
* This class is used instead of the {@link AbstractStepModel} for implementation
Modified: trunk/src/appl/parallel/model/ParallelStepModel.java
===================================================================
--- trunk/src/appl/parallel/model/ParallelStepModel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/model/ParallelStepModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,8 +2,8 @@
import java.io.Serializable;
+import appl.parallel.spmd.SPMDClientInterface;
import edu.bonn.xulu.model.StepModel;
-import appl.parallel.spmd.SPMDClientInterface;
/**
* This class extends the functionality of a Xulu-StepModel. It provides
Modified: trunk/src/appl/parallel/plugin/event/SimpleCommEventMonitor.java
===================================================================
--- trunk/src/appl/parallel/plugin/event/SimpleCommEventMonitor.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/plugin/event/SimpleCommEventMonitor.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,31 +1,21 @@
package appl.parallel.plugin.event;
-import javax.swing.SwingUtilities;
-import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+
+import javax.swing.BoxLayout;
+import javax.swing.JCheckBox;
import javax.swing.JPanel;
-import javax.swing.JFrame;
import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
import javax.swing.JTable;
-import javax.swing.JToggleButton;
-import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-import javax.swing.JCheckBox;
-import javax.swing.BoxLayout;
+import javax.swing.JTextPane;
import edu.bonn.xulu.gui.XuluInternalFrame;
-import java.awt.FlowLayout;
-import java.awt.GridLayout;
-import javax.swing.JTabbedPane;
-import java.awt.Dimension;
-import java.awt.Button;
-import java.awt.CardLayout;
-import javax.swing.JLabel;
-import java.awt.Insets;
-import javax.swing.JTextPane;
-import javax.swing.text.html.HTMLDocument;
-import javax.swing.text.DefaultStyledDocument;
-
/**
* Provides a GUI for the {@link SimpleCommEventMonitorEngine}
*
Modified: trunk/src/appl/parallel/plugin/event/SimpleCommEventMonitorPlugin.java
===================================================================
--- trunk/src/appl/parallel/plugin/event/SimpleCommEventMonitorPlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/plugin/event/SimpleCommEventMonitorPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -6,7 +6,6 @@
import appl.parallel.client.RemoteExecutionController;
import appl.parallel.event.TimeEvent;
import appl.parallel.event.TransferEvent;
-
import edu.bonn.xulu.appl.XuluPlugin;
import edu.bonn.xulu.gui.XuluInternalFrame;
import edu.bonn.xulu.plugin.appl.AbstractMenuPlugin;
Modified: trunk/src/appl/parallel/server/PartitionDataManager.java
===================================================================
--- trunk/src/appl/parallel/server/PartitionDataManager.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/server/PartitionDataManager.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -21,8 +21,8 @@
import org.apache.log4j.Logger;
import appl.data.LoadingException;
+import appl.parallel.client.ClientDataServer;
import appl.parallel.client.DataServer;
-import appl.parallel.client.ClientDataServer;
import appl.parallel.data.PartitionDataHandler;
import appl.parallel.event.CommEventSink;
import appl.parallel.event.TimeEvent;
Modified: trunk/src/appl/parallel/server/SPMDResource.java
===================================================================
--- trunk/src/appl/parallel/server/SPMDResource.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/server/SPMDResource.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,13 +1,9 @@
package appl.parallel.server;
import java.rmi.RemoteException;
-import java.util.HashMap;
-import java.util.Vector;
import appl.parallel.ComputingResource;
import appl.parallel.spmd.SPMDClientController;
-import appl.parallel.spmd.SPMDTask;
-import appl.parallel.spmd.split.SinglePartitionInfo;
import appl.parallel.spmd.split.SplitMap;
/**
Modified: trunk/src/appl/parallel/server/ServerMulticastReceiver.java
===================================================================
--- trunk/src/appl/parallel/server/ServerMulticastReceiver.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/server/ServerMulticastReceiver.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -4,7 +4,6 @@
import java.net.DatagramPacket;
import java.net.InetAddress;
import java.net.MulticastSocket;
-import java.net.SocketException;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
Modified: trunk/src/appl/parallel/server/XuluServer.java
===================================================================
--- trunk/src/appl/parallel/server/XuluServer.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/server/XuluServer.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -8,18 +8,14 @@
import java.net.MulticastSocket;
import java.net.URL;
import java.net.UnknownHostException;
-import java.rmi.MarshalledObject;
import java.rmi.Naming;
import java.rmi.NotBoundException;
import java.rmi.RMISecurityManager;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import java.rmi.activation.Activatable;
-import java.rmi.activation.ActivationID;
import java.rmi.server.ServerNotActiveException;
import java.rmi.server.UnicastRemoteObject;
import java.util.HashMap;
-import java.util.Vector;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
@@ -37,22 +33,16 @@
import appl.ext.XuluConfig;
import appl.parallel.ComputingResourceProperties;
-import appl.parallel.client.DataServer;
import appl.parallel.client.ClientDataServer;
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.AdvancedSPMDServerInterface;
-import appl.parallel.spmd.SPMDServerController;
-import appl.parallel.spmd.SPMDServerInterface;
import appl.parallel.spmd.SPMDTask;
-import appl.parallel.spmd.split.SinglePartitionInfo;
import appl.parallel.spmd.split.SplitMap;
import appl.parallel.spmd.split.SplitMap1DVertical;
import appl.parallel.spmd.split.AbstractSplitMap.NeighborhoodBoxingMode;
-import appl.parallel.thread.OneMethodThread;
import appl.parallel.util.Helper;
import appl.util.benchmark.Benchmark;
Modified: trunk/src/appl/parallel/server/XuluServerProperties.java
===================================================================
--- trunk/src/appl/parallel/server/XuluServerProperties.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/server/XuluServerProperties.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,16 +1,7 @@
package appl.parallel.server;
import java.io.Serializable;
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryPoolMXBean;
-import java.lang.management.MemoryUsage;
-import java.lang.management.ThreadMXBean;
-import java.util.List;
-import java.util.Timer;
-import org.apache.log4j.lf5.util.Resource;
-
-import appl.parallel.ComputingResourceProperties;
import appl.parallel.SimpleResourceProperties;
/**
Modified: trunk/src/appl/parallel/services/GlobalDiscoveryService.java
===================================================================
--- trunk/src/appl/parallel/services/GlobalDiscoveryService.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/services/GlobalDiscoveryService.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,6 +1,5 @@
package appl.parallel.services;
-import java.util.Iterator;
import java.util.Vector;
import org.apache.log4j.LogManager;
Modified: trunk/src/appl/parallel/services/HostnameDiscoveryService.java
===================================================================
--- trunk/src/appl/parallel/services/HostnameDiscoveryService.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/services/HostnameDiscoveryService.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,12 +1,7 @@
package appl.parallel.services;
-import java.net.MalformedURLException;
-import java.rmi.ConnectException;
import java.rmi.Naming;
-import java.rmi.NotBoundException;
-import java.rmi.RemoteException;
import java.rmi.UnknownHostException;
-import java.util.Iterator;
import java.util.Vector;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
@@ -25,7 +20,6 @@
import appl.parallel.starter.Starter;
import appl.parallel.starter.client.StarterContainer;
import appl.parallel.starter.server.XuluServerStarter;
-import appl.parallel.test.PingTestObject;
/**
* Very simple Discovery Service that simply looks up hosts from Property <br>
Modified: trunk/src/appl/parallel/services/MulticastDiscoveryService.java
===================================================================
--- trunk/src/appl/parallel/services/MulticastDiscoveryService.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/services/MulticastDiscoveryService.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -6,8 +6,6 @@
import java.net.MulticastSocket;
import java.net.UnknownHostException;
import java.rmi.Naming;
-import java.rmi.RemoteException;
-import java.util.Iterator;
import java.util.Vector;
import org.apache.log4j.BasicConfigurator;
Modified: trunk/src/appl/parallel/services/RemoteEventProxy.java
===================================================================
--- trunk/src/appl/parallel/services/RemoteEventProxy.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/services/RemoteEventProxy.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -9,9 +9,6 @@
import appl.parallel.event.CommEventSink;
import appl.parallel.event.RemoteEvent;
-import appl.parallel.event.RemoteEventSink;
-import appl.parallel.event.TimeEvent;
-import appl.parallel.event.TransferEvent;
/**
* Delays events and fires them after the delay all <b>at once</b> in one
Modified: trunk/src/appl/parallel/spmd/AdvancedSPMDClientInterface.java
===================================================================
--- trunk/src/appl/parallel/spmd/AdvancedSPMDClientInterface.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/AdvancedSPMDClientInterface.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,9 +2,6 @@
import java.io.PrintStream;
-import appl.parallel.server.PartitionDataManager;
-import appl.parallel.spmd.split.DataPartition;
-
/**
* This class extends the {@link SPMDClientInterface} with additional features for performance tuning. You can merge
* partitions in background (so that the not very cpu-intensive communication can
Modified: trunk/src/appl/parallel/spmd/AdvancedSPMDServerController.java
===================================================================
--- trunk/src/appl/parallel/spmd/AdvancedSPMDServerController.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/AdvancedSPMDServerController.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,6 +1,5 @@
package appl.parallel.spmd;
-import java.io.PrintStream;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Vector;
@@ -8,10 +7,6 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import appl.parallel.ComputingResourceContainer;
-import appl.parallel.client.DataServer;
-import appl.parallel.client.ClientDataServer;
-import appl.parallel.event.CommEventSink;
import appl.parallel.server.PartitionDataManager;
import appl.parallel.spmd.split.DataPartition;
import appl.parallel.thread.OneMethodThread;
Modified: trunk/src/appl/parallel/spmd/AdvancedSPMDServerInterface.java
===================================================================
--- trunk/src/appl/parallel/spmd/AdvancedSPMDServerInterface.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/AdvancedSPMDServerInterface.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,11 +1,7 @@
package appl.parallel.spmd;
-import java.util.Iterator;
-import java.util.Vector;
-
import appl.parallel.server.PartitionDataManager;
import appl.parallel.spmd.split.DataPartition;
-import appl.parallel.thread.OneMethodThread;
/**
* Performance optimizations can be made with this type of controller. It allows heavy
Modified: trunk/src/appl/parallel/spmd/MultiDataInfo.java
===================================================================
--- trunk/src/appl/parallel/spmd/MultiDataInfo.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/MultiDataInfo.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,12 +1,8 @@
package appl.parallel.spmd;
import java.io.Serializable;
-import java.rmi.RemoteException;
import java.util.Vector;
-import appl.parallel.server.PartitionDataServer;
-import appl.parallel.server.PartitionDataManager;
-
/**
* Instances of this class encapsulate information about multiple objects
* of the same type, e.g. lists of grids. In contrast to the MultiDataObject there
Modified: trunk/src/appl/parallel/spmd/MultiDataObject.java
===================================================================
--- trunk/src/appl/parallel/spmd/MultiDataObject.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/MultiDataObject.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -6,12 +6,9 @@
import org.apache.log4j.Logger;
import schmitzm.data.WritableGrid;
-
-import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-
import appl.parallel.client.DataServer;
-import appl.parallel.server.PartitionDataServer;
import appl.parallel.spmd.split.DataPartition;
+import edu.bonn.xulu.plugin.data.grid.MultiGrid;
/**
* A multi data object stores multiple elements of the same type.
Modified: trunk/src/appl/parallel/spmd/MultiDataPartitionObject.java
===================================================================
--- trunk/src/appl/parallel/spmd/MultiDataPartitionObject.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/MultiDataPartitionObject.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,13 +1,9 @@
package appl.parallel.spmd;
-import java.io.Serializable;
import java.rmi.RemoteException;
import java.util.Vector;
-import appl.parallel.client.DataServer;
-import appl.parallel.data.PartitionDataHandler;
import appl.parallel.server.PartitionDataServer;
-import appl.parallel.server.PartitionDataManager;
import appl.parallel.spmd.split.DataPartition;
import appl.parallel.spmd.split.PartitionInfo;
import appl.parallel.spmd.split.SinglePartitionInfo;
Modified: trunk/src/appl/parallel/spmd/SPMDClientController.java
===================================================================
--- trunk/src/appl/parallel/spmd/SPMDClientController.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/SPMDClientController.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,48 +1,36 @@
package appl.parallel.spmd;
-import java.net.InetAddress;
import java.rmi.RemoteException;
import java.util.HashMap;
import java.util.Vector;
-import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import appl.data.DataLoader;
import appl.ext.XuluConfig;
-import appl.parallel.ComputingResource;
import appl.parallel.ComputingResourceContainer;
import appl.parallel.ComputingResourceProperties;
-import appl.parallel.client.RemoteEventHandler;
import appl.parallel.client.ClientDataServer;
+import appl.parallel.client.RemoteEventHandler;
import appl.parallel.data.PartitionDataHandler;
import appl.parallel.data.PartitionHandlerFactory;
-import appl.parallel.data.XuluClientLoader;
-import appl.parallel.event.CommEvent;
import appl.parallel.event.CommEventSink;
-import appl.parallel.event.TimeEvent;
-import appl.parallel.event.TimeMonitor;
-import appl.parallel.event.TransferEvent;
-import appl.parallel.event.TransferMonitor;
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.DataPartition;
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 appl.parallel.model.AbstractParallelStepModel;
+import edu.bonn.xulu.plugin.data.grid.MultiGrid;
/**
* This class controls all the parallelization action on the client side and is
Modified: trunk/src/appl/parallel/spmd/SPMDServerController.java
===================================================================
--- trunk/src/appl/parallel/spmd/SPMDServerController.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/SPMDServerController.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,21 +2,14 @@
import java.awt.Rectangle;
import java.rmi.RemoteException;
-import java.util.HashMap;
-import java.util.Vector;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import appl.parallel.ComputingResource;
-import appl.parallel.client.DataServer;
-import appl.parallel.data.WritableGridArrayPartition;
-import appl.parallel.model.AbstractParallelStepModel;
import appl.parallel.server.PartitionDataManager;
import appl.parallel.spmd.split.DataPartition;
import appl.parallel.spmd.split.PartitionInfo;
import appl.parallel.spmd.split.SplitMap;
-import appl.parallel.spmd.split.SplittableResource;
/**
* This class controls all the parallelization action on the server side and is
Modified: trunk/src/appl/parallel/spmd/SPMDServerInterface.java
===================================================================
--- trunk/src/appl/parallel/spmd/SPMDServerInterface.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/SPMDServerInterface.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,15 +1,11 @@
package appl.parallel.spmd;
import java.awt.Rectangle;
-import java.util.HashMap;
+import appl.parallel.spmd.split.DataPartition;
import edu.bonn.xulu.plugin.data.grid.GridList;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import appl.parallel.ComputingResource;
-import appl.parallel.spmd.split.DataPartition;
-import appl.parallel.spmd.split.SplittableResource;
-
/**
* Using this interface the programmer can access the parallel functionality on server side.
* The programmer should subclass {@link AbstractSPMDTask} and use its method {@link AbstractSPMDTask#getSPMDServerController()} to
Modified: trunk/src/appl/parallel/spmd/SPMDTask.java
===================================================================
--- trunk/src/appl/parallel/spmd/SPMDTask.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/SPMDTask.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -3,10 +3,9 @@
import java.awt.Rectangle;
import java.io.Serializable;
+import schmitzm.data.WritableGrid;
import appl.parallel.server.XuluServer;
-import schmitzm.data.WritableGrid;
-
/**
* A SPMDTask should be executed on servers using the SPMD-paradigm.
* <br>
Modified: trunk/src/appl/parallel/spmd/split/AbstractSplitMap.java
===================================================================
--- trunk/src/appl/parallel/spmd/split/AbstractSplitMap.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/split/AbstractSplitMap.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,7 +1,6 @@
package appl.parallel.spmd.split;
import java.awt.Rectangle;
-import java.awt.geom.Rectangle2D;
/**
* This class can be used for the implementation of {@link SplitMap}s. It already
Modified: trunk/src/appl/parallel/spmd/split/SinglePartitionInfo.java
===================================================================
--- trunk/src/appl/parallel/spmd/split/SinglePartitionInfo.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/split/SinglePartitionInfo.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,12 +2,10 @@
import java.io.Serializable;
-import appl.data.DataLoader;
-import appl.parallel.data.PartitionDataHandler;
-
-// fuer Doku
import javax.activation.DataHandler;
+
import appl.parallel.client.DataServer;
+import appl.parallel.data.PartitionDataHandler;
import appl.parallel.data.XuluClientLoader;
/**
Modified: trunk/src/appl/parallel/spmd/split/SplitMap.java
===================================================================
--- trunk/src/appl/parallel/spmd/split/SplitMap.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/split/SplitMap.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,9 +2,7 @@
import java.awt.Rectangle;
import java.io.Serializable;
-import java.net.InetAddress;
-import appl.parallel.spmd.split.SplittableResource;
import appl.parallel.spmd.split.AbstractSplitMap.NeighborhoodBoxingMode;
/**
Modified: trunk/src/appl/parallel/spmd/split/SplitMap1DHorizontal.java
===================================================================
--- trunk/src/appl/parallel/spmd/split/SplitMap1DHorizontal.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/split/SplitMap1DHorizontal.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,10 +1,7 @@
package appl.parallel.spmd.split;
import java.awt.Rectangle;
-import java.awt.geom.Rectangle2D;
-import appl.parallel.spmd.split.AbstractSplitMap.NeighborhoodBoxingMode;
-import appl.util.RasterMetaData;
import schmitzm.data.WritableGrid;
/**
Modified: trunk/src/appl/parallel/spmd/split/SplitMap1DVertical.java
===================================================================
--- trunk/src/appl/parallel/spmd/split/SplitMap1DVertical.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/split/SplitMap1DVertical.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,10 +1,7 @@
package appl.parallel.spmd.split;
import java.awt.Rectangle;
-import java.awt.geom.Rectangle2D;
-import appl.parallel.spmd.split.AbstractSplitMap.NeighborhoodBoxingMode;
-import appl.util.RasterMetaData;
import schmitzm.data.WritableGrid;
/**
Modified: trunk/src/appl/parallel/spmd/split/SplitMap2D.java
===================================================================
--- trunk/src/appl/parallel/spmd/split/SplitMap2D.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/split/SplitMap2D.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,14 +2,10 @@
import java.awt.Point;
import java.awt.Rectangle;
-import java.awt.geom.Rectangle2D;
import java.util.Vector;
-import appl.parallel.client.RemoteExecutionController;
-import appl.parallel.spmd.split.AbstractSplitMap.NeighborhoodBoxingMode;
-import appl.parallel.util.Helper;
-import appl.util.RasterMetaData;
import schmitzm.data.WritableGrid;
+import appl.parallel.util.Helper;
/**
* 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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/split/SplittableGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,7 +1,5 @@
package appl.parallel.spmd.split;
-import java.awt.Rectangle;
-
import schmitzm.data.WritableGrid;
/**
Modified: trunk/src/appl/parallel/spmd/split/SplittableResource.java
===================================================================
--- trunk/src/appl/parallel/spmd/split/SplittableResource.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/spmd/split/SplittableResource.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,9 +1,5 @@
package appl.parallel.spmd.split;
-import java.awt.Rectangle;
-
-import org.w3c.dom.css.Rect;
-
import appl.data.DataLoader;
/**
Modified: trunk/src/appl/parallel/starter/client/XuluStarterClientPanel.java
===================================================================
--- trunk/src/appl/parallel/starter/client/XuluStarterClientPanel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/starter/client/XuluStarterClientPanel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,28 +1,20 @@
package appl.parallel.starter.client;
-import javax.swing.JPanel;
-import java.awt.GridBagLayout;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.Insets;
+import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JLabel;
-import javax.swing.BoxLayout;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
import javax.swing.ListSelectionModel;
-import java.awt.Insets;
import javax.swing.border.SoftBevelBorder;
-import javax.swing.table.DefaultTableModel;
-import edu.bonn.xulu.XuluModellingPlatform;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import appl.parallel.gui.ParallelControlPanelEngine;
-
-import java.awt.Rectangle;
-import javax.swing.JList;
-import java.awt.CardLayout;
-import java.awt.GridLayout;
-
/**
* The GUI for the XuluStarterController . The events are controlled by the
* {@link XuluStarterController}. This GUI was created with the Visual Editor
@@ -221,4 +213,4 @@
return restartButton;
}
-} // @jve:decl-index=0:visual-constraint="10,10"
+}
\ No newline at end of file
Modified: trunk/src/appl/parallel/starter/client/XuluStarterController.java
===================================================================
--- trunk/src/appl/parallel/starter/client/XuluStarterController.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/starter/client/XuluStarterController.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -8,13 +8,11 @@
import java.util.Vector;
import javax.swing.DefaultListCellRenderer;
-import javax.swing.DefaultListModel;
import javax.swing.JList;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import appl.parallel.client.RemoteExecutionController;
import appl.parallel.services.HostnameDiscoveryService;
import appl.parallel.starter.Starter;
import appl.parallel.starter.server.XuluServerStarter;
Modified: trunk/src/appl/parallel/starter/client/XuluStarterControllerPlugin.java
===================================================================
--- trunk/src/appl/parallel/starter/client/XuluStarterControllerPlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/starter/client/XuluStarterControllerPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,7 +1,6 @@
package appl.parallel.starter.client;
import appl.util.XuluFrameAdapter;
-import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluPlugin;
import edu.bonn.xulu.gui.XuluInternalFrame;
import edu.bonn.xulu.plugin.appl.AbstractMenuPlugin;
Modified: trunk/src/appl/parallel/starter/server/XuluServerStarter.java
===================================================================
--- trunk/src/appl/parallel/starter/server/XuluServerStarter.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/starter/server/XuluServerStarter.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,7 +11,6 @@
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -27,17 +26,13 @@
import java.rmi.server.UnicastRemoteObject;
import javax.swing.JOptionPane;
-import javax.swing.JTextArea;
import schmitzm.swing.TextAreaPrintStream;
-import schmitzm.swing.event.PopupMenuListener;
-
import appl.ext.XuluConfig;
import appl.parallel.ComputingResource;
import appl.parallel.server.XuluServer;
import appl.parallel.starter.Starter;
import appl.parallel.util.Helper;
-import appl.util.GeneralUtil;
/**
* 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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/starter/server/XuluStarterServerGUI.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,27 +1,20 @@
package appl.parallel.starter.server;
-import java.awt.BorderLayout;
-import javax.swing.JPanel;
-import javax.swing.JFrame;
-import java.awt.GridBagLayout;
-import javax.swing.JTextArea;
-import javax.swing.JLabel;
-import javax.swing.JButton;
-import java.awt.GridBagConstraints;
import java.awt.Dimension;
-import javax.swing.JScrollPane;
-import javax.swing.BoxLayout;
+import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import javax.swing.JPopupMenu;
+import javax.swing.JButton;
+import javax.swing.JFrame;
import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
import schmitzm.swing.event.PopupMenuListener;
-import java.awt.FlowLayout;
-import java.awt.GridLayout;
-import java.awt.CardLayout;
/**
* This is the GUI for the {@link XuluServerStarter}
Modified: trunk/src/appl/parallel/test/MulticastSocketTest.java
===================================================================
--- trunk/src/appl/parallel/test/MulticastSocketTest.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/test/MulticastSocketTest.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,10 +2,8 @@
import java.io.IOException;
import java.net.DatagramPacket;
-import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.MulticastSocket;
-import java.net.UnknownHostException;
public class MulticastSocketTest {
public static void main( String[] args ) throws IOException
Modified: trunk/src/appl/parallel/test/PartitialGridTest.java
===================================================================
--- trunk/src/appl/parallel/test/PartitialGridTest.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/test/PartitialGridTest.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -4,12 +4,13 @@
import java.awt.Rectangle;
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 schmitzm.data.WritableGridRaster;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.io.GeoImportUtil;
/**
* Simple JUnit Test
Modified: trunk/src/appl/parallel/test/SPMDTest.java
===================================================================
--- trunk/src/appl/parallel/test/SPMDTest.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/test/SPMDTest.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,43 +2,29 @@
import java.awt.Rectangle;
import java.io.File;
-import java.io.FileInputStream;
import java.io.Serializable;
-import java.util.Random;
import java.util.Vector;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
-
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
import schmitzm.data.WritableGridRaster;
import schmitzm.geotools.io.GeoImportUtil;
-
import appl.parallel.ComputingResourceContainer;
-import appl.parallel.client.RemoteEventHandler;
import appl.parallel.client.ClientDataServer;
+import appl.parallel.client.RemoteEventHandler;
import appl.parallel.data.splittable.SplittableLLProxyGrid;
import appl.parallel.services.GlobalDiscoveryService;
-import appl.parallel.spmd.AbstractSPMDTask;
import appl.parallel.spmd.SPMDClientController;
-import appl.parallel.spmd.SPMDTask;
-import appl.parallel.spmd.SPMDServerController;
import appl.parallel.spmd.split.SplittableGrid;
import appl.util.RasterMetaData;
import appl.util.RasterUtil;
+import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
/**
* Generated code for the test suite <b>SPMDTest</b> located at
Modified: trunk/src/appl/parallel/test/SPMDTest_MultiGrid.java
===================================================================
--- trunk/src/appl/parallel/test/SPMDTest_MultiGrid.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/test/SPMDTest_MultiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,43 +2,30 @@
import java.awt.Rectangle;
import java.io.File;
-import java.io.FileInputStream;
import java.io.Serializable;
-import java.util.Random;
import java.util.Vector;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Layout;
-import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
-
import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
import schmitzm.data.WritableGridRaster;
import schmitzm.geotools.io.GeoImportUtil;
-
import appl.parallel.ComputingResourceContainer;
-import appl.parallel.client.RemoteEventHandler;
import appl.parallel.client.ClientDataServer;
+import appl.parallel.client.RemoteEventHandler;
import appl.parallel.data.splittable.SplittableLLProxyGrid;
import appl.parallel.services.GlobalDiscoveryService;
-import appl.parallel.spmd.AbstractSPMDTask;
import appl.parallel.spmd.SPMDClientController;
-import appl.parallel.spmd.SPMDTask;
-import appl.parallel.spmd.SPMDServerController;
import appl.parallel.spmd.split.SplittableGrid;
import appl.util.RasterMetaData;
import appl.util.RasterUtil;
+import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
/**
* This is a minor modification of {@link SPMDTest}. It is only used to test the
Modified: trunk/src/appl/parallel/test/SplitMapTest.java
===================================================================
--- trunk/src/appl/parallel/test/SplitMapTest.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/test/SplitMapTest.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,29 +2,21 @@
import java.awt.Rectangle;
import java.io.File;
-import java.io.FileInputStream;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
-import appl.parallel.data.splittable.SplittableGridLLFactory;
+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.parallel.util.Helper;
-import appl.util.GeneralUtil;
import appl.util.RasterMetaData;
import appl.util.RasterUtil;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridRaster;
-import schmitzm.geotools.io.GeoImportUtil;
-
/**
* Generated code for the test suite <b>SplitMapTest</b> located at
* <i>/XuluSVN/javasrc/appl/parallel/test/SplitMapTest.testsuite</i>.
Modified: trunk/src/appl/parallel/test/XuluGridTestCase.java
===================================================================
--- trunk/src/appl/parallel/test/XuluGridTestCase.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/test/XuluGridTestCase.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -3,15 +3,11 @@
import java.awt.Rectangle;
import java.io.BufferedOutputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-
-import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_ArcInfoAsciiGrid;
-
import schmitzm.data.WritableGrid;
import schmitzm.data.WritableGridArray;
import schmitzm.data.WritableGridRaster;
@@ -21,6 +17,7 @@
import appl.parallel.spmd.split.WritableGridPartition;
import appl.util.RasterMetaData;
import appl.util.RasterUtil;
+import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_ArcInfoAsciiGrid;
/**
* Generated code for the test suite <b>XuluGridTestCase</b> located at
Modified: trunk/src/appl/parallel/test/XuluServerTest.java
===================================================================
--- trunk/src/appl/parallel/test/XuluServerTest.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/test/XuluServerTest.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,16 +1,12 @@
package appl.parallel.test;
-import java.io.Serializable;
-import java.net.MalformedURLException;
import java.rmi.Naming;
-import java.rmi.NotBoundException;
import java.rmi.RemoteException;
-import appl.parallel.server.XuluServer;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import appl.parallel.server.XuluServer;
/**
* Generated code for the test suite <b>XuluServerTest</b> located at
Modified: trunk/src/appl/parallel/test/generalTestClass.java
===================================================================
--- trunk/src/appl/parallel/test/generalTestClass.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/test/generalTestClass.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,11 +1,7 @@
package appl.parallel.test;
-import java.awt.Rectangle;
-
-import schmitzm.data.WritableGrid;
-
/**
* @author Dominik Appl
*/
Modified: trunk/src/appl/parallel/thread/ExecutionThread.java
===================================================================
--- trunk/src/appl/parallel/thread/ExecutionThread.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/thread/ExecutionThread.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,11 +1,9 @@
package appl.parallel.thread;
-import java.nio.channels.Pipe.SinkChannel;
import java.rmi.RemoteException;
import java.util.concurrent.Callable;
import appl.parallel.ComputingResourceProperties;
-import appl.parallel.client.RemoteEventHandler;
import appl.parallel.event.CommEvent;
import appl.parallel.event.CommEventSink;
import appl.parallel.event.TimeEvent;
Modified: trunk/src/appl/parallel/util/Helper.java
===================================================================
--- trunk/src/appl/parallel/util/Helper.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/util/Helper.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -9,7 +9,6 @@
import java.util.Vector;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
@@ -17,11 +16,9 @@
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-
import appl.parallel.ComputingResource;
import appl.parallel.ComputingResourceContainer;
import appl.parallel.ComputingResourceProperties;
-import appl.parallel.test.PingTestObject;
/**
* See method description for details.
Modified: trunk/src/appl/parallel/util/PartitionUtil.java
===================================================================
--- trunk/src/appl/parallel/util/PartitionUtil.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/parallel/util/PartitionUtil.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -6,9 +6,6 @@
import schmitzm.data.WritableGrid;
import schmitzm.data.WritableGridArray;
import appl.parallel.data.WritableGridArrayPartition;
-import appl.parallel.data.WritableGridArrayPartition.Double;
-import appl.parallel.data.WritableGridArrayPartition.Float;
-import appl.parallel.data.WritableGridArrayPartition.Integer;
import appl.parallel.spmd.split.SplittableResource;
import appl.parallel.spmd.split.WritableGridPartition;
import appl.util.RasterMetaData;
Modified: trunk/src/appl/plugin/multimodelcontrol/MultiModelControlFrame.java
===================================================================
--- trunk/src/appl/plugin/multimodelcontrol/MultiModelControlFrame.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/plugin/multimodelcontrol/MultiModelControlFrame.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,56 +1,23 @@
package appl.plugin.multimodelcontrol;
-import java.awt.BorderLayout;
-import javax.swing.JPanel;
-import javax.swing.JFrame;
-import javax.swing.JSplitPane;
-import java.awt.GridBagLayout;
+import java.awt.Cursor;
import java.awt.Dimension;
-import javax.swing.JList;
import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.Insets;
-import javax.swing.ButtonGroup;
+import javax.swing.BoxLayout;
import javax.swing.JButton;
import javax.swing.JLabel;
-import javax.swing.JTextField;
-import javax.swing.JRadioButton;
-import javax.swing.BoxLayout;
-import java.awt.CardLayout;
-import javax.swing.DefaultListModel;
-import javax.swing.ListSelectionModel;
-import javax.swing.BorderFactory;
-import javax.swing.border.EtchedBorder;
-import java.awt.FlowLayout;
-import java.awt.Insets;
-import java.awt.GridLayout;
-import javax.swing.border.SoftBevelBorder;
-import java.awt.ComponentOrientation;
-import java.awt.Cursor;
-import javax.swing.plaf.multi.MultiPanelUI;
-import javax.swing.plaf.basic.BasicPanelUI;
-import javax.swing.JCheckBox;
-import javax.swing.SwingConstants;
-import javax.swing.JToggleButton;
-import java.awt.Font;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemEvent;
-
-import javax.swing.JTabbedPane;
-
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.gui.XuluInternalFrame;
+import javax.swing.JList;
+import javax.swing.JPanel;
import javax.swing.JScrollPane;
-import appl.parallel.gui.ParallelControlPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JTextPane;
import javax.swing.JTextArea;
-import javax.swing.border.TitledBorder;
-import java.awt.Color;
+import javax.swing.ListSelectionModel;
-// fuer Doku
import appl.parallel.gui.ParallelControlPanelEngine;
+import edu.bonn.xulu.gui.XuluInternalFrame;
/**
* The GUI for the ModelControlCenter (MCC). All the interesting stuff happens in the
Modified: trunk/src/appl/plugin/multimodelcontrol/MultiModelControlHandler.java
===================================================================
--- trunk/src/appl/plugin/multimodelcontrol/MultiModelControlHandler.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/plugin/multimodelcontrol/MultiModelControlHandler.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,36 +1,28 @@
package appl.plugin.multimodelcontrol;
import java.awt.Color;
-import java.awt.PopupMenu;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.Vector;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import javax.swing.DefaultListModel;
-import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.ListSelectionModel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import appl.parallel.gui.ParallelControlPanelEngine;
-
import schmitzm.data.event.ObjectEvent;
import schmitzm.data.event.ObjectListener;
import schmitzm.lang.WorkingThread;
import schmitzm.lang.WorkingThreadAdapter;
-import schmitzm.lang.WorkingThreadListener;
import schmitzm.swing.TextAreaPrintStream;
+import appl.parallel.gui.ParallelControlPanelEngine;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.ModelControlManager;
import edu.bonn.xulu.gui.ModelControlFrame;
-import edu.bonn.xulu.model.StepModel;
import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.model.event.ModelEvent;
-import edu.bonn.xulu.model.event.ModelListener;
import edu.bonn.xulu.plugin.gui.ModelControlFrame_Basic;
/**
Modified: trunk/src/appl/plugin/multimodelcontrol/MultiModelControlPlugin.java
===================================================================
--- trunk/src/appl/plugin/multimodelcontrol/MultiModelControlPlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/plugin/multimodelcontrol/MultiModelControlPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,7 +1,5 @@
package appl.plugin.multimodelcontrol;
-import javax.swing.JMenuItem;
-
import edu.bonn.xulu.gui.XuluInternalFrame;
import edu.bonn.xulu.plugin.appl.AbstractMenuPlugin;
Modified: trunk/src/appl/util/GeneralUtil.java
===================================================================
--- trunk/src/appl/util/GeneralUtil.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/util/GeneralUtil.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -10,11 +10,11 @@
import java.io.ObjectOutputStream;
import java.net.URL;
+import net.jini.loader.pref.PreferredClassLoader;
+
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import net.jini.loader.pref.PreferredClassLoader;
-
/**
* General utility class. See method description for details.
*
Modified: trunk/src/appl/util/RasterUtil.java
===================================================================
--- trunk/src/appl/util/RasterUtil.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/util/RasterUtil.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,5 +1,7 @@
package appl.util;
+import gtmig.org.geotools.gce.arcgrid.ArcGridRaster;
+
import java.awt.image.DataBuffer;
import java.io.File;
import java.io.FileInputStream;
@@ -7,12 +9,11 @@
import java.io.IOException;
import java.io.InputStreamReader;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
import schmitzm.data.WritableGrid;
import schmitzm.geotools.io.GeoImportUtil;
-import org.geotools.gce.arcgrid.ArcGridRaster;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
/**
* This Class provides some simple mostly independent functions
* related to Geo-Rasters and {@link WritableGrid WritableGrids}.
Modified: trunk/src/appl/util/XuluFrameAdapter.java
===================================================================
--- trunk/src/appl/util/XuluFrameAdapter.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/util/XuluFrameAdapter.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,9 +1,10 @@
package appl.util;
+import java.awt.Dimension;
+
import javax.swing.JPanel;
import edu.bonn.xulu.gui.XuluInternalFrame;
-import java.awt.Dimension;
/**
* Makes an XuluInternalFrame out of a {@link JPanel}.
Modified: trunk/src/appl/util/benchmark/SimpleBenchmark.java
===================================================================
--- trunk/src/appl/util/benchmark/SimpleBenchmark.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/appl/util/benchmark/SimpleBenchmark.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -8,7 +8,6 @@
import appl.ext.XuluConfig;
import appl.parallel.data.splittable.SplittableLLProxyGrid;
import appl.util.RasterMetaData;
-import appl.util.RasterUtil;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
/**
Modified: trunk/src/de/skrueger/xulu/plugin/gnur/RVarSingleGrid.java
===================================================================
--- trunk/src/de/skrueger/xulu/plugin/gnur/RVarSingleGrid.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/de/skrueger/xulu/plugin/gnur/RVarSingleGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -4,8 +4,6 @@
import schmitzm.data.property.Property;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-
public class RVarSingleGrid extends RVarAdapter {
// SingleGrid grid = (SingleGrid) super.prop;
Modified: trunk/src/de/skrueger/xulu/plugin/gnur/RVarsTableModel.java
===================================================================
--- trunk/src/de/skrueger/xulu/plugin/gnur/RVarsTableModel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/de/skrueger/xulu/plugin/gnur/RVarsTableModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -4,11 +4,8 @@
import schmitzm.data.event.ObjectEvent;
import schmitzm.data.event.ObjectListener;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.geotools.gui.GeotoolsGUIUtil;
import schmitzm.swing.SelectionInputOption;
import schmitzm.swing.table.AbstractMutableTableModel;
-import schmitzm.swing.table.MutableTableModel;
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/XuluModellingPlatform.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,45 +11,38 @@
package edu.bonn.xulu;
-import javax.swing.UIManager;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Vector;
-import java.util.TreeSet;
-import java.util.SortedSet;
-import java.util.Locale;
-import java.io.FileInputStream;
import java.io.File;
+import java.io.FileInputStream;
import java.io.PrintStream;
+import java.util.Locale;
+import javax.swing.UIManager;
+
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import schmitzm.geotools.GTUtil;
+import schmitzm.geotools.io.GeoImportUtil;
+import schmitzm.lang.ResourceProvider;
import schmitzm.lang.SortableVector;
+import schmitzm.swing.ExceptionDialog;
import schmitzm.swing.SwingUtil;
import schmitzm.swing.SwingWorker;
-import schmitzm.swing.ExceptionDialog;
-import schmitzm.geotools.GTUtil;
-import schmitzm.lang.ResourceProvider;
-import schmitzm.lang.DefaultComparator;
-import schmitzm.geotools.io.GeoImportUtil;
-
-import edu.bonn.xulu.gui.XuluMainFrame;
-import edu.bonn.xulu.gui.XuluStartingFrame;
+import appl.ext.XuluConfig;
+import edu.bonn.xulu.appl.DataPool;
+import edu.bonn.xulu.appl.EventManager;
+import edu.bonn.xulu.appl.ModelControlManager;
+import edu.bonn.xulu.appl.VisualisationManager;
import edu.bonn.xulu.appl.XuluComponent;
import edu.bonn.xulu.appl.XuluComponentUtil;
-import edu.bonn.xulu.appl.DataPool;
+import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.appl.XuluPlugin;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.appl.XuluRegistryReader;
-import edu.bonn.xulu.appl.VisualisationManager;
-import edu.bonn.xulu.appl.ModelControlManager;
-import edu.bonn.xulu.appl.EventManager;
-import edu.bonn.xulu.appl.XuluPlugin;
-import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.gui.XuluMainFrame;
+import edu.bonn.xulu.gui.XuluStartingFrame;
import edu.bonn.xulu.plugin.appl.DataScriptInterpreter_Basic;
import edu.bonn.xulu.plugin.appl.XuluRegistryReader_BasicAscii;
-import appl.ext.XuluConfig;
-
/**
* Diese Klasse implementiert das Hauptprogramm der Xulu-Modeling-Platform.
* Beim Starten koennen folgende Kommandozeilenparameter angegeben werden:
@@ -239,7 +232,7 @@
String defaultCRS = XuluConfig.getXuluConfig().getProperty("General.DefaultCRS");
CoordinateReferenceSystem crs = defaultCRS != null ? GTUtil.createCRS(defaultCRS) : null;
if ( crs != null ) {
- GeoImportUtil.DEFAULT_CRS = crs;
+ GeoImportUtil.setDefaultCRS(crs);
giveStatus(" done.\n",infoStream);
} else {
giveStatus(" failt!\n",infoStream);
Modified: trunk/src/edu/bonn/xulu/appl/AbstractCommandInterpreter.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/AbstractCommandInterpreter.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/AbstractCommandInterpreter.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,10 +11,10 @@
package edu.bonn.xulu.appl;
-import java.io.*;
-import schmitzm.lang.OperationCanceledException;
-import edu.bonn.xulu.*;
-import edu.bonn.xulu.appl.*;
+import java.io.InputStream;
+
+import schmitzm.lang.OperationCanceledException;
+import edu.bonn.xulu.XuluModellingPlatform;
/**
* Diese Klasse bildet eine Basis-Implementierung eines {@link ScriptInterpreter}.
Modified: trunk/src/edu/bonn/xulu/appl/AbstractManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/AbstractManager.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/AbstractManager.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,16 +11,14 @@
package edu.bonn.xulu.appl;
-import java.util.Vector;
+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 schmitzm.lang.DuplicateException;
-import schmitzm.data.event.AbstractObjectTraceable;
-import schmitzm.data.event.ObjectChangeEvent;
-import schmitzm.data.event.Invoker;
-
-// Nur fuer Doku
-import schmitzm.data.event.ObjectListener;
-
/**
* Diese Klasse stellt einen allgemeinen Manager dar. Dieser dient dazu,
* Komponenten, denen ein grafisches Fenster zugeordnet ist, in einer Liste zu
Modified: trunk/src/edu/bonn/xulu/appl/AbstractScriptInterpreter.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/AbstractScriptInterpreter.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/AbstractScriptInterpreter.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,11 +11,7 @@
package edu.bonn.xulu.appl;
-import java.io.*;
-import edu.bonn.xulu.*;
-import edu.bonn.xulu.appl.*;
-
/**
* Diese Klasse bildet eine Basis-Implementierung eines {@link ScriptInterpreter}.
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a> (University of Bonn/Germany)
Modified: trunk/src/edu/bonn/xulu/appl/AbstractXuluPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/AbstractXuluPlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/AbstractXuluPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,9 +11,8 @@
package edu.bonn.xulu.appl;
-import schmitzm.lang.AbstractNamedObject;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.XuluPlugin;
+import schmitzm.lang.AbstractNamedObject;
+import edu.bonn.xulu.XuluModellingPlatform;
/**
* Diese Klasse stellt eine Basis-Implementierung von {@link XuluPlugin} dar.
Modified: trunk/src/edu/bonn/xulu/appl/DataPool.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/DataPool.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/DataPool.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,22 +11,21 @@
package edu.bonn.xulu.appl;
-import java.util.Vector;
-import java.util.Random;
-import java.util.Hashtable;
-import java.util.Enumeration;
+import java.util.Enumeration;
+import java.util.Hashtable;
+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 edu.bonn.xulu.data.DuplicateXuluObjectIDException;
+import edu.bonn.xulu.data.DuplicateXuluObjectNameException;
+import edu.bonn.xulu.data.XuluObject;
-import schmitzm.data.event.AbstractObjectTraceable;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.AbstractObjectEvent;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.NameChangeEvent;
-import schmitzm.data.event.Invoker;
-
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.data.DuplicateXuluObjectIDException;
-import edu.bonn.xulu.data.DuplicateXuluObjectNameException;
-
/**
* Diese Klasse stellt den Xulu-Datenpool dar, in dem saemtliche (globalen)
* Daten fuer die Modellierung verwaltet werden.<br>
Modified: trunk/src/edu/bonn/xulu/appl/EventHandler.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/EventHandler.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/EventHandler.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,11 +11,10 @@
package edu.bonn.xulu.appl;
-import schmitzm.data.event.ObjectEvent;
-import edu.bonn.xulu.appl.AbstractManager;
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.XuluModellingPlatform;
+import schmitzm.data.event.ObjectEvent;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.model.XuluModel;
/**
* Ein EventHandler stellt eine Zuordnung her zwischen
Modified: trunk/src/edu/bonn/xulu/appl/EventManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/EventManager.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/EventManager.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,34 +11,25 @@
package edu.bonn.xulu.appl;
-import java.util.Vector;
import java.util.Enumeration;
+import java.util.Vector;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectTraceable;
-import schmitzm.data.event.ObjectChangeEvent;
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 edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.DataPool;
-import edu.bonn.xulu.appl.EventHandler;
+import edu.bonn.xulu.gui.ModelControlFrame;
import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.model.event.ModelListener;
import edu.bonn.xulu.model.event.ModelEvent;
-import edu.bonn.xulu.gui.ModelControlFrame;
-
-import edu.bonn.xulu.plugin.appl.VisualisationHandlerFactory;
+import edu.bonn.xulu.model.event.ModelListener;
import edu.bonn.xulu.plugin.appl.FileExportHandlerFactory;
-
-// nur fuer Doku
import edu.bonn.xulu.plugin.appl.VisualisationHandler;
-import edu.bonn.xulu.appl.ModelControlManager;
-import edu.bonn.xulu.appl.Handler;
+import edu.bonn.xulu.plugin.appl.VisualisationHandlerFactory;
/**
* Ueber den Xulu-Event-Manager werden verschiedene Reaktionen auf Ereignisse
Modified: trunk/src/edu/bonn/xulu/appl/Handler.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/Handler.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/Handler.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.appl;
-import schmitzm.data.event.ObjectEvent;
+import schmitzm.data.event.ObjectEvent;
/**
* Ein Handler beschreibt eine konkrete Reaktion auf ein Ereignis. Diese ist jedoch
Modified: trunk/src/edu/bonn/xulu/appl/HandlerFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/HandlerFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/HandlerFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,8 +11,8 @@
package edu.bonn.xulu.appl;
-import edu.bonn.xulu.io.Factory;
-import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.io.Factory;
/**
* Diese Klasse stellt eine Factory fuer einen {@link Handler} dar. Die Factory
Modified: trunk/src/edu/bonn/xulu/appl/ModelControlManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/ModelControlManager.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/ModelControlManager.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,16 +11,12 @@
package edu.bonn.xulu.appl;
-import java.util.Vector;
+import java.util.Vector;
+
+import schmitzm.data.event.AbstractObjectTraceable;
+import schmitzm.data.event.ObjectListener;
+import edu.bonn.xulu.gui.ModelControlFrame;
-import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.appl.AbstractManager;
-import edu.bonn.xulu.gui.ModelControlFrame;
-
-// nur fuer Doku
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.AbstractObjectTraceable;
-
/**
* Der ModelManager verwaltet alle in der Xulu-Modelling-Platform aktiven
* Modell-Instanzen durch eine Liste der zugehoerigen {@linkplain ModelControlFrame Kontrollfenster}.<br>
Modified: trunk/src/edu/bonn/xulu/appl/RecentImports.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/RecentImports.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/RecentImports.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,10 +12,11 @@
package edu.bonn.xulu.appl;
import java.io.File;
+
import org.apache.log4j.Logger;
+import schmitzm.lang.LimitedVector;
import appl.ext.XuluConfig;
-import 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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/RecentScripts.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,13 +12,12 @@
package edu.bonn.xulu.appl;
import java.io.File;
+
import org.apache.log4j.Logger;
-import appl.ext.XuluConfig;
import schmitzm.lang.LimitedVector;
+import appl.ext.XuluConfig;
import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.io.IODefinition;
-import edu.bonn.xulu.appl.ScriptInterpreter;
/**
Modified: trunk/src/edu/bonn/xulu/appl/ScriptInterpreter.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/ScriptInterpreter.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/ScriptInterpreter.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,15 +11,14 @@
package edu.bonn.xulu.appl;
-import java.io.InputStream;
-import java.io.File;
-import java.io.FileInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+import schmitzm.lang.AbstractNamedObject;
+import schmitzm.lang.NamedObject;
+import edu.bonn.xulu.XuluModellingPlatform;
-import schmitzm.lang.NamedObject;
-import schmitzm.lang.AbstractNamedObject;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.io.IODefinition;
-
/**
* Ein <code>ScriptInterpreter</code> fuehrt eine Reihe von Befehlen
* in einer Xulu-Umgebung aus. Die Befehle erhaelt er ueber einen Eingabe-Stream.
Modified: trunk/src/edu/bonn/xulu/appl/ScriptablePlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/ScriptablePlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/ScriptablePlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,11 +11,7 @@
package edu.bonn.xulu.appl;
-import java.util.Vector;
-import schmitzm.lang.NamedObject;
-import edu.bonn.xulu.XuluModellingPlatform;
-
/**
* This class extends the XuluPlugin interface in order to support easy
* scripting operations on plugins. The commands may be forwarded by the {@link edu.bonn.xulu.plugin.appl.DataScriptInterpreter_Basic}.
Modified: trunk/src/edu/bonn/xulu/appl/VisualisationManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/VisualisationManager.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/VisualisationManager.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,15 +11,10 @@
package edu.bonn.xulu.appl;
-import java.util.Vector;
+import java.util.Vector;
+
+import schmitzm.data.event.ObjectListener;
-import edu.bonn.xulu.appl.VisualisationTool;
-import edu.bonn.xulu.appl.AbstractManager;
-
-// nur fuer Doku
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.AbstractObjectTraceable;
-
/**
* Der VisualisationManager verwaltet saemtliche in der Xulu-Applikation
* <u>instanziierten</u> Visualisierungstools. An dieser Stelle ist der
Modified: trunk/src/edu/bonn/xulu/appl/VisualisationTool.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/VisualisationTool.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/VisualisationTool.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,7 +12,6 @@
package edu.bonn.xulu.appl;
import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.VisualisationUpdateListener;
/**
* Dieses Interface bildet die Grundlage fuer verschiedenste Visualisierungstools.
Modified: trunk/src/edu/bonn/xulu/appl/VisualisationUpdateListener.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/VisualisationUpdateListener.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/VisualisationUpdateListener.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,13 +11,7 @@
package edu.bonn.xulu.appl;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectChangeEvent;
-import schmitzm.data.event.ObjectCloseEvent;
-import edu.bonn.xulu.appl.VisualisationTool;
-
/**
* Zwischen Xulu-Datenobjekt ("source") und visualisiertem Objekt ("visObject")
* besteht in der Regel ein Unterschied, da das Datenobjekt meist nicht direkt
Modified: trunk/src/edu/bonn/xulu/appl/XuluConstants.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/XuluConstants.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/XuluConstants.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,9 +12,10 @@
package edu.bonn.xulu.appl;
import java.io.File;
-import javax.swing.ImageIcon;
import java.util.Locale;
+import javax.swing.ImageIcon;
+
import schmitzm.lang.ResourceProvider;
import schmitzm.swing.SwingUtil;
import edu.bonn.xulu.XuluModellingPlatform;
@@ -28,9 +29,9 @@
*/
public interface XuluConstants {
/** Versionsnummer der Xulu-Modelling-Platform. **/
- public static final String VERSION = "1.8.1";
+ public static final String VERSION = "1.8-gt2-2.6";
/** Versionsdatum der Xulu-Modelling-Platform. **/
- public static final String VERSION_DATE = "2010-02-10";
+ public static final String VERSION_DATE = "2009-08-31";
/** 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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/XuluPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,8 +11,8 @@
package edu.bonn.xulu.appl;
-import schmitzm.lang.NamedObject;
-import edu.bonn.xulu.XuluModellingPlatform;
+import schmitzm.lang.NamedObject;
+import edu.bonn.xulu.XuluModellingPlatform;
/**
* Diese Klasse stellt die Schnittstelle zu Xulu-Plugins dar. Implementierungen
Modified: trunk/src/edu/bonn/xulu/appl/XuluRegistry.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/XuluRegistry.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/XuluRegistry.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,28 +11,24 @@
package edu.bonn.xulu.appl;
-import java.util.Vector;
-import java.util.Hashtable;
+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 edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.ImportFactory;
+import edu.bonn.xulu.io.InstantiationFactory;
+import edu.bonn.xulu.io.TypeMapping;
+import edu.bonn.xulu.model.XuluModel;
-import schmitzm.lang.NamedObject;
-import schmitzm.lang.LimitedVector;
-import schmitzm.data.event.AbstractObjectTraceable;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectChangeEvent;
-import schmitzm.data.event.Invoker;
-import edu.bonn.xulu.io.IODefinition;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.TypeMapping;
-import edu.bonn.xulu.appl.ScriptInterpreter;
-import edu.bonn.xulu.appl.VisualisationTool;
-import edu.bonn.xulu.appl.XuluPlugin;
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.model.XuluModel;
-
/**
* In der Xulu-Registry werden alle dynamischen Komponenten registriert,
* die in der Xulu-Applikation verwendet werden sollen. Hierzu zaehlen
Modified: trunk/src/edu/bonn/xulu/appl/XuluRegistryReader.java
===================================================================
--- trunk/src/edu/bonn/xulu/appl/XuluRegistryReader.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/appl/XuluRegistryReader.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,12 +11,11 @@
package edu.bonn.xulu.appl;
-import java.io.InputStream;
-import java.io.IOException;
+import java.io.IOException;
+import java.io.InputStream;
+
+import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.XuluRegistry;
-
/**
* Dieses Interface bildet die Basis fuer eine Klasse, die die XuluRegistry
* einlesen kann.
Modified: trunk/src/edu/bonn/xulu/data/AbstractXuluObject.java
===================================================================
--- trunk/src/edu/bonn/xulu/data/AbstractXuluObject.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/data/AbstractXuluObject.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,21 +13,20 @@
import java.util.Enumeration;
-import edu.bonn.xulu.appl.DataPool;
-import schmitzm.data.property.PropertySet;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.PropertyType;
+import schmitzm.data.ObjectStructure;
import schmitzm.data.event.AbstractObjectTraceable;
-import schmitzm.data.event.ObjectEvent;
+import schmitzm.data.event.Invoker;
+import schmitzm.data.event.NameChangeEvent;
import schmitzm.data.event.ObjectChangeEvent;
import schmitzm.data.event.ObjectCloseEvent;
-import schmitzm.data.event.NameChangeEvent;
+import schmitzm.data.event.ObjectEvent;
import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.Invoker;
-// nur fuer Doku
-import schmitzm.data.ObjectStructure;
+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 edu.bonn.xulu.appl.DataPool;
/**
Modified: trunk/src/edu/bonn/xulu/data/DynamicXuluObject.java
===================================================================
--- trunk/src/edu/bonn/xulu/data/DynamicXuluObject.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/data/DynamicXuluObject.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,11 +11,11 @@
package edu.bonn.xulu.data;
-import schmitzm.data.property.PropertySet;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.io.InstantiationFactory;
+import schmitzm.data.property.Properties;
+import schmitzm.data.property.Property;
+import schmitzm.data.property.PropertySet;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.InstantiationFactory;
/**
* Diese Klasse bildet die Basisimplementierung eines <u>dynamischen</u>
Modified: trunk/src/edu/bonn/xulu/data/XuluObject.java
===================================================================
--- trunk/src/edu/bonn/xulu/data/XuluObject.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/data/XuluObject.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,12 +11,9 @@
package edu.bonn.xulu.data;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.PropertySet;
import schmitzm.data.event.ObjectTraceable;
+import schmitzm.data.property.Properties;
import schmitzm.lang.NamedObject;
-
import edu.bonn.xulu.appl.XuluComponent;
/**
Modified: trunk/src/edu/bonn/xulu/gui/AbstractManagerFrame.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/AbstractManagerFrame.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/AbstractManagerFrame.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.gui;
-import edu.bonn.xulu.appl.AbstractManager;
+import edu.bonn.xulu.appl.AbstractManager;
/**
* Diese Klasse bildet eine abstrakte Oberklasse fuer alle grafischen
Modified: trunk/src/edu/bonn/xulu/gui/DataPoolFrame.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/DataPoolFrame.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/DataPoolFrame.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,7 +11,6 @@
package edu.bonn.xulu.gui;
-import edu.bonn.xulu.data.XuluObject;
/**
* Diese Klasse bildet eine abstrakte Oberklasse fuer alle grafischen
Modified: trunk/src/edu/bonn/xulu/gui/DataPoolInputOption.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/DataPoolInputOption.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/DataPoolInputOption.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,18 +11,14 @@
package edu.bonn.xulu.gui;
-import schmitzm.swing.BrowseInputOption;
-import schmitzm.swing.TreeSelectionDialog;
+import schmitzm.data.property.Property;
+import schmitzm.swing.BrowseInputOption;
+import schmitzm.swing.MultipleOptionPane;
+import schmitzm.swing.TreeSelectionDialog;
+import edu.bonn.xulu.appl.DataPool;
+import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.data.XuluObject;
-import schmitzm.data.property.Property;
-
-import edu.bonn.xulu.appl.DataPool;
-import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.data.XuluObject;
-
-// nur fuer Doku
-import schmitzm.swing.MultipleOptionPane;
-
/**
* Diese Klasse stellt eine Eingabe-Option fuer einen {@link MultipleOptionPane}-Dialog
* dar, in der ein Daten-Objekt aus dem {@linkplain DataPool Xulu-Datenpool}
Modified: trunk/src/edu/bonn/xulu/gui/DataPoolMenu.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/DataPoolMenu.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/DataPoolMenu.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,45 +11,33 @@
package edu.bonn.xulu.gui;
-import java.io.File;
-
-import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
-import javax.swing.JFileChooser;
+import java.awt.event.ActionListener;
+import java.io.File;
import java.util.Vector;
-import schmitzm.io.FileOutputStream;
-import schmitzm.io.FileInputStream;
-
-import schmitzm.lang.NamedObject;
-
-import schmitzm.data.property.Property;
-import schmitzm.data.property.AccessViolationException;
-import schmitzm.data.event.ObjectListener;
import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectTraceable;
-import schmitzm.data.event.GeneralObjectChangeEvent;
-
+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.ObjectSubMenu;
import schmitzm.swing.menu.ObjectMenuItem;
-
-import schmitzm.lang.AlreadyHandledException;
-
+import schmitzm.swing.menu.ObjectSubMenu;
import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.XuluRegistry;
-import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.appl.VisualisationTool;
import edu.bonn.xulu.appl.VisualisationManager;
-import edu.bonn.xulu.appl.VisualisationUpdateListener;
-import edu.bonn.xulu.io.IODefinition;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ImportFactory;
+import edu.bonn.xulu.appl.VisualisationTool;
+import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.data.XuluDataException;
+import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.FactoryCanceledException;
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.data.XuluDataException;
+import edu.bonn.xulu.io.IODefinition;
+import edu.bonn.xulu.io.ImportFactory;
+import edu.bonn.xulu.io.InstantiationFactory;
/**
* Diese Klasse stellt eine Menuestruktur fuer die Verwaltung des Datenpool
Modified: trunk/src/edu/bonn/xulu/gui/DataPoolTreeModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/DataPoolTreeModel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/DataPoolTreeModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,25 +11,22 @@
package edu.bonn.xulu.gui;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.DefaultTreeModel;
+import java.util.Enumeration;
+
import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreeNode;
-import java.util.Enumeration;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.ScalarProperty;
+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.PropertyReadAccess;
-import schmitzm.data.property.ListPropertyReadAccess;
-
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.swing.tree.EmptyNode;
+import schmitzm.data.property.Property;
+import schmitzm.data.property.ScalarProperty;
import schmitzm.swing.tree.ContentNode;
-
+import 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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/ModelContentManagerContainer.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,29 +11,21 @@
package edu.bonn.xulu.gui;
-import java.awt.Container;
-import java.awt.Color;
-import javax.swing.BoxLayout;
-import javax.swing.SpringLayout;
-import java.util.Enumeration;
-import java.util.Collection;
-import java.util.Vector;
+import java.awt.Color;
+import java.awt.Container;
+import java.util.Vector;
+
+import javax.swing.SpringLayout;
+
+import schmitzm.data.event.ObjectEvent;
+import schmitzm.data.event.ObjectListener;
+import schmitzm.swing.SelectionInputOption;
+import schmitzm.swing.SpringUtilities;
+import edu.bonn.xulu.appl.DataPool;
+import edu.bonn.xulu.model.ModelContentManager;
+import edu.bonn.xulu.model.ModelResource;
-import schmitzm.swing.SpringUtilities;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.NameChangeEvent;
-import schmitzm.swing.SelectionInputOption;
-
-import edu.bonn.xulu.appl.DataPool;
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.model.ModelContentManager;
-import edu.bonn.xulu.model.ModelResource;
-
-
/**
* Diese Klasse stellt eine Container dar, ueber den die im Datenpool befindlichen
* Objekte den benoetigten Ressourcen eines Modells (siehe {@link ModelContentManager})
Modified: trunk/src/edu/bonn/xulu/gui/ModelControlFrame.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/ModelControlFrame.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/ModelControlFrame.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,17 +11,11 @@
package edu.bonn.xulu.gui;
-import javax.swing.JFrame;
+import javax.swing.JFrame;
+
+import edu.bonn.xulu.appl.AbstractManager;
+import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.appl.AbstractManager;
-
-
-// nur fuer Doku
-import edu.bonn.xulu.gui.XuluInternalFrame;
-import edu.bonn.xulu.gui.DataPoolFrame;
-import edu.bonn.xulu.gui.RegistryFrame;
-
/**
* Diese Klasse bildet eine abstrakte Oberklasse fuer alle Implementierungen des
* Modell-Kontroll-Fensters. Die Modellfenster werden (im Gegensatz z.B. zum
Modified: trunk/src/edu/bonn/xulu/gui/ModelManagerTreeModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/ModelManagerTreeModel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/ModelManagerTreeModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,17 +11,14 @@
package edu.bonn.xulu.gui;
-import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.DefaultTreeModel;
+
+import schmitzm.swing.TreeSelectionDialog;
+import schmitzm.swing.tree.ContentNode;
+import schmitzm.swing.tree.EmptyNode;
+import edu.bonn.xulu.appl.ModelControlManager;
+import edu.bonn.xulu.model.XuluModel;
-import schmitzm.swing.tree.EmptyNode;
-import schmitzm.swing.tree.ContentNode;
-
-import edu.bonn.xulu.appl.ModelControlManager;
-import edu.bonn.xulu.model.XuluModel;
-
-// nur fuer Doku
-import schmitzm.swing.TreeSelectionDialog;
-
/**
* Diese Klasse stellt ein TreeModel fuer den {@link ModelControlManager Xulu-Modell-Manager}
* dar. Zwar handelt es sich bei den Modellen lediglich um eine Liste, die
Modified: trunk/src/edu/bonn/xulu/gui/ObjectOrModelInputOption.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/ObjectOrModelInputOption.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/ObjectOrModelInputOption.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,21 +11,18 @@
package edu.bonn.xulu.gui;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.MutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.MutableTreeNode;
+
+import schmitzm.swing.MultipleOptionPane;
+import schmitzm.swing.TreeSelectionDialog;
+import schmitzm.swing.tree.EmptyNode;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.DataPool;
+import edu.bonn.xulu.appl.ModelControlManager;
+import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.model.XuluModel;
-import schmitzm.swing.TreeSelectionDialog;
-import schmitzm.swing.tree.EmptyNode;
-
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.DataPool;
-import edu.bonn.xulu.appl.ModelControlManager;
-import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.model.XuluModel;
-
-// nur fuer Doku
-import schmitzm.swing.MultipleOptionPane;
-
/**
* Diese Klasse stellt eine Eingabe-Option fuer einen {@link MultipleOptionPane}-Dialog
* dar, in der ein Daten-Objekt aus dem {@linkplain DataPool Xulu-Datenpool}
Modified: trunk/src/edu/bonn/xulu/gui/StatusFrame.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/StatusFrame.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/StatusFrame.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,13 +11,8 @@
package edu.bonn.xulu.gui;
-import java.io.PrintStream;
-import java.io.OutputStream;
-import javax.swing.JMenu;
-import edu.bonn.xulu.XuluModellingPlatform;
-import java.awt.event.ActionListener;
-import schmitzm.swing.event.PopupMenuListener;
-import java.awt.Dimension;
+import java.io.OutputStream;
+import java.io.PrintStream;
/**
* Diese Klasse bildet eine abstrakte Oberklasse fuer alle grafischen
Modified: trunk/src/edu/bonn/xulu/gui/XuluGUIMessages.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluGUIMessages.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/XuluGUIMessages.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,22 +12,19 @@
package edu.bonn.xulu.gui;
import java.awt.Component;
-import javax.swing.JOptionPane;
-import java.util.ResourceBundle;
import java.io.File;
+import javax.swing.JOptionPane;
-import schmitzm.lang.LangUtil;
-import schmitzm.swing.ExceptionDialog;
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 edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.data.XuluDataException;
-import schmitzm.swing.MultipleOptionPane;
-import javax.swing.JCheckBox;
+import edu.bonn.xulu.data.XuluObject;
/**
Modified: trunk/src/edu/bonn/xulu/gui/XuluGUIUtil.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluGUIUtil.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/XuluGUIUtil.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,61 +11,51 @@
package edu.bonn.xulu.gui;
+import java.awt.Component;
import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.util.Vector;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.Enumeration;
-import java.util.ResourceBundle;
+import java.util.Vector;
-import java.awt.Component;
-import java.awt.BorderLayout;
+import javax.swing.JCheckBox;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JDialog;
-import appl.parallel.gui.ModelControlFrame_parallel;
-
-import schmitzm.lang.LangUtil;
-import schmitzm.lang.AlreadyHandledException;
-import schmitzm.lang.OperationCanceledException;
-import schmitzm.data.property.Property;
import schmitzm.data.property.ListProperty;
import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.ScalarProperty;
-
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.swing.SwingWorker;
-import schmitzm.swing.MultipleOptionPane;
+import schmitzm.lang.LangUtil;
+import schmitzm.lang.OperationCanceledException;
import schmitzm.swing.InputOption;
-import schmitzm.swing.SelectionInputOption;
import schmitzm.swing.ManualInputOption;
-
+import schmitzm.swing.MultipleOptionPane;
+import schmitzm.swing.SelectionInputOption;
+import schmitzm.swing.StatusDialog;
+import schmitzm.swing.SwingWorker;
+import appl.parallel.gui.ModelControlFrame_parallel;
import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.io.IODefinition;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.FactoryCanceledException;
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.data.DuplicateXuluObjectNameException;
-import edu.bonn.xulu.appl.XuluConstants;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.appl.ScriptInterpreter;
-import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.gui.XuluGUIMessages;
+import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.data.DuplicateXuluObjectNameException;
+import edu.bonn.xulu.data.XuluDataException;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.FactoryCanceledException;
+import edu.bonn.xulu.io.IODefinition;
+import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.model.ModelResource;
+import edu.bonn.xulu.model.XuluModel;
import edu.bonn.xulu.plugin.gui.ModelControlFrame_Basic;
-// nur fuer Doku
-import schmitzm.swing.StatusDialog;
-
/**
* Diese Klasse stellt Funktionen fuer die Xulu-GUI zur Verfuegung.
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a> (University of Bonn/Germany)
Modified: trunk/src/edu/bonn/xulu/gui/XuluInternalFrame.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluInternalFrame.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/XuluInternalFrame.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,11 +11,12 @@
package edu.bonn.xulu.gui;
-import java.awt.Component;
-import javax.swing.JInternalFrame;
+import java.awt.Component;
+
+import javax.swing.JInternalFrame;
+
+import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.appl.XuluConstants;
-
/**
* Diese Klasse bildet die abstrakte Oberklasse fuer ein Fenster, das im
* {@link edu.bonn.xulu.gui.XuluMainFrame} dargestellt werden soll.
Modified: trunk/src/edu/bonn/xulu/gui/XuluLanguageManagerFrame.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluLanguageManagerFrame.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/XuluLanguageManagerFrame.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,35 +11,35 @@
package edu.bonn.xulu.gui;
-import java.awt.Frame;
+import java.awt.AWTEvent;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
-import java.awt.AWTEvent;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
import java.awt.event.WindowEvent;
-import javax.swing.JDialog;
-import javax.swing.JButton;
-import javax.swing.JTable;
-import javax.swing.JScrollPane;
-import javax.swing.JTextPane;
-import javax.swing.table.AbstractTableModel;
import java.io.File;
import java.util.Locale;
+import java.util.ResourceBundle;
import java.util.Set;
import java.util.TreeSet;
-import java.util.ResourceBundle;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.JTextPane;
+import javax.swing.table.AbstractTableModel;
+
+import schmitzm.lang.LocaleComparator;
+import schmitzm.lang.ResourceProvider;
import schmitzm.swing.ExceptionDialog;
+import schmitzm.swing.InputOption;
import schmitzm.swing.JPanel;
+import schmitzm.swing.ManualInputOption;
import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.InputOption;
import schmitzm.swing.SelectionInputOption;
-import schmitzm.swing.ManualInputOption;
import schmitzm.swing.event.InputOptionAdapter;
-import schmitzm.lang.ResourceProvider;
-import schmitzm.lang.LocaleComparator;
-
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluComponent;
Modified: trunk/src/edu/bonn/xulu/gui/XuluMainFrame.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluMainFrame.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/XuluMainFrame.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,47 +11,50 @@
package edu.bonn.xulu.gui;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import java.awt.AWTEvent;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.LayoutManager;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.WindowEvent;
+import java.util.Vector;
-import appl.ext.XuluConfig;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JDesktopPane;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JInternalFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
-import java.util.Vector;
-
-import schmitzm.lang.AlreadyHandledException;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.SelectionInputOption;
-import schmitzm.swing.InputOption;
+import schmitzm.data.event.ObjectEvent;
+import schmitzm.data.event.ObjectListener;
import schmitzm.swing.ExceptionDialog;
import schmitzm.swing.SwingUtil;
import schmitzm.swing.menu.ObjectMenuItem;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
-
+import appl.ext.XuluConfig;
import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.DataPool;
+import edu.bonn.xulu.appl.EventManager;
+import edu.bonn.xulu.appl.ModelControlManager;
import edu.bonn.xulu.appl.ScriptInterpreter;
+import edu.bonn.xulu.appl.VisualisationManager;
import edu.bonn.xulu.appl.XuluComponent;
-import edu.bonn.xulu.appl.XuluComponentUtil;
-import edu.bonn.xulu.appl.DataPool;
-import edu.bonn.xulu.appl.EventManager;
import edu.bonn.xulu.appl.XuluRegistry;
-import edu.bonn.xulu.appl.VisualisationManager;
-import edu.bonn.xulu.appl.ModelControlManager;
-
-import edu.bonn.xulu.gui.XuluGUIMessages;
-import edu.bonn.xulu.gui.DataPoolFrame;
+import edu.bonn.xulu.plugin.gui.AbstractManagerFrame_BasicTable;
import edu.bonn.xulu.plugin.gui.DataPoolFrame_Tree;
-import edu.bonn.xulu.plugin.gui.DataPoolFrame_BasicTable;
-import edu.bonn.xulu.gui.StatusFrame;
-import edu.bonn.xulu.plugin.gui.StatusFrame_BasicTextArea;
-import edu.bonn.xulu.gui.RegistryFrame;
-import edu.bonn.xulu.plugin.gui.RegistryFrame_Tree;
-import edu.bonn.xulu.gui.AbstractManagerFrame;
-import edu.bonn.xulu.plugin.gui.AbstractManagerFrame_BasicTable;
import edu.bonn.xulu.plugin.gui.EventManagerFrame_BasicTable;
import edu.bonn.xulu.plugin.gui.PluginManagerFrame_BasicTable;
-import edu.bonn.xulu.gui.ModelControlFrame;
+import edu.bonn.xulu.plugin.gui.RegistryFrame_Tree;
+import edu.bonn.xulu.plugin.gui.StatusFrame_BasicTextArea;
/**
* Diese Klasse stellt das Hauptfenster der Xulu-Modelling-Platform dar.
Modified: trunk/src/edu/bonn/xulu/gui/XuluMainFrameInfo.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluMainFrameInfo.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/XuluMainFrameInfo.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,14 +11,33 @@
package edu.bonn.xulu.gui;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.text.*;
-import javax.swing.border.*;
-import schmitzm.swing.ExceptionDialog;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.XuluComponent;
+import java.awt.AWTEvent;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.WindowEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextPane;
+import javax.swing.text.Style;
+import javax.swing.text.StyleConstants;
+import javax.swing.text.StyleContext;
+import javax.swing.text.StyledDocument;
+
+import schmitzm.swing.ExceptionDialog;
+import edu.bonn.xulu.appl.XuluComponent;
/**
* Diese Klasse stellt einen Info-Dialog zur Xulu-Modelling-Platform dar,
Modified: trunk/src/edu/bonn/xulu/gui/XuluStartingFrame.java
===================================================================
--- trunk/src/edu/bonn/xulu/gui/XuluStartingFrame.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/gui/XuluStartingFrame.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,23 +12,18 @@
package edu.bonn.xulu.gui;
import java.awt.Component;
+import java.io.PrintStream;
+import java.util.Vector;
+
import javax.swing.JLabel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
-import javax.swing.ImageIcon;
-import java.util.ResourceBundle;
-import java.util.Vector;
-import java.io.PrintStream;
-import schmitzm.lang.ResourceProvider;
-import schmitzm.swing.SwingUtil;
import schmitzm.swing.StatusDialog;
import schmitzm.swing.TextAreaPrintStream;
+import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluConstants;
-// nur fuer Doku
-import edu.bonn.xulu.XuluModellingPlatform;
-
/**
* Diese Klasse stellt einen Dialog dar, der angezeigt wird, waehrend die
* Xulu-Applikation gestartet wird. Neben einem Status-Balken wird ein
Modified: trunk/src/edu/bonn/xulu/io/AbstractFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/io/AbstractFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/io/AbstractFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,8 +11,7 @@
package edu.bonn.xulu.io;
-import edu.bonn.xulu.appl.XuluRegistry;
-import edu.bonn.xulu.io.Factory;
+import edu.bonn.xulu.appl.XuluRegistry;
/**
* Diese Klasse bildet eine Basisklasse fuer alle Factorys und implementiert
Modified: trunk/src/edu/bonn/xulu/io/ExportFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/io/ExportFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/io/ExportFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,9 +12,6 @@
package edu.bonn.xulu.io;
// nur fuer Doku
-import java.io.OutputStream;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
/**
* Dieses Interface bildet den Obertyp fuer alle Export-Factorys. Diese haben
Modified: trunk/src/edu/bonn/xulu/io/Factory.java
===================================================================
--- trunk/src/edu/bonn/xulu/io/Factory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/io/Factory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.io;
-import schmitzm.lang.NamedObject;
+import schmitzm.lang.NamedObject;
/**
* Dieses Interface bildet den Obertyp fuer jegliche Art von Factory.
Modified: trunk/src/edu/bonn/xulu/io/FactoryCanceledException.java
===================================================================
--- trunk/src/edu/bonn/xulu/io/FactoryCanceledException.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/io/FactoryCanceledException.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,9 +11,6 @@
package edu.bonn.xulu.io;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
/**
* Diese Exception wird geworfen, wenn der Anwender die "Arbeit" einer
Modified: trunk/src/edu/bonn/xulu/io/IODefinition.java
===================================================================
--- trunk/src/edu/bonn/xulu/io/IODefinition.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/io/IODefinition.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,10 +11,7 @@
package edu.bonn.xulu.io;
-import java.io.File;
-import schmitzm.lang.AbstractNamedObject;
-import edu.bonn.xulu.gui.DataPoolMenu;
-import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.appl.XuluRegistry;
/**
* Diese Klasse stellt eine Oberklasse fuer die Informationen dar, die zum
Modified: trunk/src/edu/bonn/xulu/io/ImportFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/io/ImportFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/io/ImportFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,9 +11,7 @@
package edu.bonn.xulu.io;
-import edu.bonn.xulu.appl.XuluRegistry;
-// nur fuer Doku
-import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.appl.XuluRegistry;
/**
* Dieses Interface bildet den Obertyp fuer alle Import-Factorys. Diese haben
* die Aufgabe, ein Objekt aus einer Import-Quelle (z.B. einer Datei) zu
Modified: trunk/src/edu/bonn/xulu/io/TypeMapping.java
===================================================================
--- trunk/src/edu/bonn/xulu/io/TypeMapping.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/io/TypeMapping.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.io;
-import java.util.Vector;
+import java.util.Vector;
/**
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a> (University of Bonn/Germany)
Modified: trunk/src/edu/bonn/xulu/model/AbstractModelContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/AbstractModelContentManager.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/AbstractModelContentManager.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,16 +13,13 @@
import java.util.Map;
-import edu.bonn.xulu.model.ModelResource;
-import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.data.XuluDataException;
+import org.apache.log4j.Logger;
import schmitzm.lang.LangUtil;
import schmitzm.lang.ResourceProvider;
-import schmitzm.swing.CaptionsChangeable;
+import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.data.XuluDataException;
-import org.apache.log4j.Logger;
-
/**
* Diese Klasse stellt eine abstrakte Basis-Implementierung fuer den
* {@link ModelContentManager} dar. Das einizge, das fuer ein Modell
Modified: trunk/src/edu/bonn/xulu/model/AbstractModelResource.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/AbstractModelResource.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/AbstractModelResource.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,11 +12,8 @@
package edu.bonn.xulu.model;
import schmitzm.lang.ResourceProvider;
-
-import edu.bonn.xulu.model.ModelResource;
-import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.data.XuluDataException;
/**
* Diese Klasse bildet eine abstrakte Basis-Implementierung fuer eine Modell-Ressource.
Modified: trunk/src/edu/bonn/xulu/model/AbstractStepModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/AbstractStepModel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/AbstractStepModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,11 +13,9 @@
import schmitzm.lang.ResourceProvider;
import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.model.AbstractXuluModel;
-import edu.bonn.xulu.model.StepModel;
-import edu.bonn.xulu.model.event.ModelListener;
-import edu.bonn.xulu.model.event.ModelStepStartedEvent;
-import edu.bonn.xulu.model.event.ModelStepFinishedEvent;
+import edu.bonn.xulu.model.event.ModelListener;
+import edu.bonn.xulu.model.event.ModelStepFinishedEvent;
+import edu.bonn.xulu.model.event.ModelStepStartedEvent;
/**
* Diese Klasse implementiert ein Modell, welches schrittweise ausgefuehrt
Modified: trunk/src/edu/bonn/xulu/model/AbstractXuluModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/AbstractXuluModel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/AbstractXuluModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,30 +11,26 @@
package edu.bonn.xulu.model;
+import java.awt.Component;
import java.io.PrintStream;
import java.util.Map;
import java.util.Vector;
-import java.awt.Component;
+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 edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.model.ModelContentManager;
-import edu.bonn.xulu.model.ModelCanceledException;
-import edu.bonn.xulu.model.event.ModelListener;
+import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.model.event.ModelDisposedEvent;
import edu.bonn.xulu.model.event.ModelEvent;
import edu.bonn.xulu.model.event.ModelInitialisedEvent;
+import edu.bonn.xulu.model.event.ModelListener;
import edu.bonn.xulu.model.event.ModelStartedEvent;
import edu.bonn.xulu.model.event.ModelStoppedEvent;
-import edu.bonn.xulu.model.event.ModelDisposedEvent;
-import org.apache.log4j.Logger;
-import edu.bonn.xulu.appl.XuluConstants;
-
/**
* Diese Klasse stellt eine Basis-Implementierung eines Xulu-Modells dar.
* Es werden alle Methoden des {@link XuluModel}-Interface implementiert, in dem
Modified: trunk/src/edu/bonn/xulu/model/DefaultModelResource.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/DefaultModelResource.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/DefaultModelResource.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -10,7 +10,6 @@
**/
package edu.bonn.xulu.model;
-import edu.bonn.xulu.model.AbstractModelResource;
import edu.bonn.xulu.data.XuluDataException;
/**
Modified: trunk/src/edu/bonn/xulu/model/ModelContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/ModelContentManager.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/ModelContentManager.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,8 +12,7 @@
package edu.bonn.xulu.model;
import schmitzm.swing.CaptionsChangeable;
-import edu.bonn.xulu.model.ModelResource;
-import edu.bonn.xulu.data.XuluDataException;
+import edu.bonn.xulu.data.XuluDataException;
/**
* Der ModelContentManager spezifiziert die Datenbasis, die ein Modell fuer
Modified: trunk/src/edu/bonn/xulu/model/ModelResource.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/ModelResource.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/ModelResource.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,8 +11,7 @@
package edu.bonn.xulu.model;
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.data.XuluDataException;
+import edu.bonn.xulu.data.XuluDataException;
/**
* Eine Ressource beschreibt allgemein ein Datenobjekt, das für die Modellierung
Modified: trunk/src/edu/bonn/xulu/model/PropertiesResource.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/PropertiesResource.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/PropertiesResource.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,12 +12,8 @@
package edu.bonn.xulu.model;
import schmitzm.data.property.Properties;
-import edu.bonn.xulu.model.AbstractModelResource;
import edu.bonn.xulu.data.XuluDataException;
-// nur fuer Doku
-import edu.bonn.xulu.model.ModelResource;
-
/**
* Diese Implementierung von <code>ModelResource</code> laesst nur
* {@linkplain Properties Properties-Objekte} als Datenobjekt zu.<br>
Modified: trunk/src/edu/bonn/xulu/model/StepModelThread.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/StepModelThread.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/StepModelThread.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,9 +11,6 @@
package edu.bonn.xulu.model;
-import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.model.XuluModelThread;
-import edu.bonn.xulu.model.StepModel;
import edu.bonn.xulu.model.event.ModelListener;
import edu.bonn.xulu.model.event.StepModelAdapter;
Modified: trunk/src/edu/bonn/xulu/model/ValuePropertyResource.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/ValuePropertyResource.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/ValuePropertyResource.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,9 +11,7 @@
package edu.bonn.xulu.model;
-import edu.bonn.xulu.data.XuluDataException;
import schmitzm.data.property.ValueProperty;
-import schmitzm.data.property.PropertyReadAccess;
import schmitzm.data.property.ValuePropertyType;
import schmitzm.temp.BaseTypeUtil;
Modified: trunk/src/edu/bonn/xulu/model/XuluModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/XuluModel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/XuluModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,14 +11,14 @@
package edu.bonn.xulu.model;
+import java.awt.Component;
import java.io.PrintStream;
-import java.awt.Component;
+
import schmitzm.lang.NamedObject;
import schmitzm.lang.ResourceProvider;
import schmitzm.swing.CaptionsChangeable;
-import edu.bonn.xulu.model.ModelContentManager;
+import edu.bonn.xulu.model.event.ModelEvent;
import edu.bonn.xulu.model.event.ModelListener;
-import edu.bonn.xulu.model.event.ModelEvent;
/**
* Dieses Interface definiert, wie eine Modell-Klasse aufgebaut sein muss,
Modified: trunk/src/edu/bonn/xulu/model/XuluModelThread.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/XuluModelThread.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/XuluModelThread.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,8 +11,7 @@
package edu.bonn.xulu.model;
-import schmitzm.lang.WorkingThread;
-import edu.bonn.xulu.model.XuluModel;
+import 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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/event/AbstractModelEvent.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,8 +11,8 @@
package edu.bonn.xulu.model.event;
-import schmitzm.data.event.AbstractObjectEvent;
-import edu.bonn.xulu.model.XuluModel;
+import schmitzm.data.event.AbstractObjectEvent;
+import edu.bonn.xulu.model.XuluModel;
/**
* Diese Klasse bildet eine Basis-Implementierung fuer Modell-Ereignisse.
Modified: trunk/src/edu/bonn/xulu/model/event/ModelAdapter.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/event/ModelAdapter.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/event/ModelAdapter.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,9 +11,8 @@
package edu.bonn.xulu.model.event;
-import schmitzm.data.event.ObjectEvent;
-import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.model.event.ModelListener;
+import schmitzm.data.event.ObjectEvent;
+import edu.bonn.xulu.model.XuluModel;
/**
* Diese Klasse stellt eine Basis-Implementierung des Interfaces
Modified: trunk/src/edu/bonn/xulu/model/event/ModelDisposedEvent.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/event/ModelDisposedEvent.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/event/ModelDisposedEvent.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model.event;
-import edu.bonn.xulu.model.XuluModel;
+import edu.bonn.xulu.model.XuluModel;
/**
* Diese Klasse repraesentiert ein Ereignis, das ausgeloest wird, wenn die
Modified: trunk/src/edu/bonn/xulu/model/event/ModelEvent.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/event/ModelEvent.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/event/ModelEvent.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,8 +11,8 @@
package edu.bonn.xulu.model.event;
-import schmitzm.data.event.ObjectEvent;
-import edu.bonn.xulu.model.XuluModel;
+import schmitzm.data.event.ObjectEvent;
+import edu.bonn.xulu.model.XuluModel;
/**
* Dieses Interface stellt ein allgemeines Ereignis dar, welches von einem
Modified: trunk/src/edu/bonn/xulu/model/event/ModelInitialisedEvent.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/event/ModelInitialisedEvent.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/event/ModelInitialisedEvent.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model.event;
-import edu.bonn.xulu.model.XuluModel;
+import edu.bonn.xulu.model.XuluModel;
/**
* Diese Klasse repraesentiert ein Ereignis, das ausgeloest wird, wenn ein
Modified: trunk/src/edu/bonn/xulu/model/event/ModelListener.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/event/ModelListener.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/event/ModelListener.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,10 +11,8 @@
package edu.bonn.xulu.model.event;
-import schmitzm.data.event.ObjectListener;
+import schmitzm.data.event.ObjectListener;
-import edu.bonn.xulu.model.XuluModel;
-
/**
* Diese Klasse stellt einen Listener dar, der bei bestimmten Modell-Aktivitaeten
* informiert wird.
Modified: trunk/src/edu/bonn/xulu/model/event/ModelStartedEvent.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/event/ModelStartedEvent.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/event/ModelStartedEvent.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model.event;
-import edu.bonn.xulu.model.XuluModel;
+import edu.bonn.xulu.model.XuluModel;
/**
* Diese Klasse repraesentiert ein Ereignis, das ausgeloest wird, wenn der Ablauf
Modified: trunk/src/edu/bonn/xulu/model/event/ModelStoppedEvent.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/event/ModelStoppedEvent.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/event/ModelStoppedEvent.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,7 +11,7 @@
package edu.bonn.xulu.model.event;
-import edu.bonn.xulu.model.XuluModel;
+import edu.bonn.xulu.model.XuluModel;
/**
* Diese Klasse repraesentiert ein Ereignis, das ausgeloest wird, wenn der Ablauf
Modified: trunk/src/edu/bonn/xulu/model/event/StepModelAdapter.java
===================================================================
--- trunk/src/edu/bonn/xulu/model/event/StepModelAdapter.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/model/event/StepModelAdapter.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,7 +12,6 @@
package edu.bonn.xulu.model.event;
import edu.bonn.xulu.model.StepModel;
-import edu.bonn.xulu.model.event.ModelAdapter;
import edu.bonn.xulu.model.XuluModel;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/appl/AbstractMenuPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/AbstractMenuPlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/AbstractMenuPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,17 +11,16 @@
package edu.bonn.xulu.plugin.appl;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import javax.swing.JMenuItem;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.JMenuItem;
+
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.AbstractXuluPlugin;
+import edu.bonn.xulu.gui.XuluGUIMessages;
+import edu.bonn.xulu.gui.XuluInternalFrame;
-import schmitzm.lang.LangUtil;
-
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.AbstractXuluPlugin;
-import edu.bonn.xulu.gui.XuluInternalFrame;
-import edu.bonn.xulu.gui.XuluGUIMessages;
-
/**
* Diese Klasse stellt eine abstrakte Oberklasse fuer Plugins dar, die
* sich (bzw. ein zum Plugin gehoerendes Anwendungsfenster) in das Xulu-Menue
Modified: trunk/src/edu/bonn/xulu/plugin/appl/DataExportHandler.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/DataExportHandler.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/DataExportHandler.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -14,9 +14,7 @@
import schmitzm.data.event.ObjectEvent;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.AbstractHandler;
-import edu.bonn.xulu.appl.VisualisationTool;
import edu.bonn.xulu.gui.XuluGUIMessages;
-import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.ExportFactory;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/appl/DataExportHandlerFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/DataExportHandlerFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/DataExportHandlerFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,18 +11,10 @@
package edu.bonn.xulu.plugin.appl;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.SelectionInputOption;
-
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.Handler;
import edu.bonn.xulu.appl.HandlerFactory;
-import edu.bonn.xulu.appl.VisualisationTool;
-import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.io.Factory;
import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.gui.DataPoolInputOption;
import edu.bonn.xulu.io.ExportFactory;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/appl/DataScriptInterpreter_Basic.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/DataScriptInterpreter_Basic.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/DataScriptInterpreter_Basic.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,32 +11,27 @@
package edu.bonn.xulu.plugin.appl;
-import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
-
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.Vector;
-import java.util.StringTokenizer;
import schmitzm.io.IOUtil;
+import schmitzm.lang.AlreadyHandledException;
import schmitzm.lang.LangUtil;
-
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.AbstractCommandInterpreter;
import edu.bonn.xulu.appl.ScriptablePlugin;
import edu.bonn.xulu.appl.XuluPlugin;
+import edu.bonn.xulu.data.XuluDataException;
+import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.gui.XuluGUIUtil;
import edu.bonn.xulu.io.IODefinition;
-import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.io.TypeMappingException;
-import schmitzm.lang.OperationCanceledException;
-import schmitzm.lang.AlreadyHandledException;
/**
* Dieser Interpreter fuehrt IO-Befehle des Datenpools aus. Einleitender Tag und
Modified: trunk/src/edu/bonn/xulu/plugin/appl/DateTimePlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/DateTimePlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/DateTimePlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,20 +11,14 @@
package edu.bonn.xulu.plugin.appl;
-import java.text.DateFormat;
-import java.util.GregorianCalendar;
-import java.awt.BorderLayout;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
+import java.text.DateFormat;
+import java.util.GregorianCalendar;
+
+import schmitzm.lang.WorkingThread;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.XuluPlugin;
-import schmitzm.lang.AbstractNamedObject;
-import schmitzm.lang.WorkingThread;
-import schmitzm.swing.SwingWorker;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.XuluPlugin;
-
-
/**
* Diese Klasse stellt ein Plugin fuer die Xulu-Applikation dar, welches die
* aktuelle Uhrzeit (und Datum) in der Titel-Leiste des Xulu-Hauptfensters
Modified: trunk/src/edu/bonn/xulu/plugin/appl/DateTimeWindowPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/DateTimeWindowPlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/DateTimeWindowPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,18 +11,18 @@
package edu.bonn.xulu.plugin.appl;
-import java.text.DateFormat;
-import java.util.GregorianCalendar;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.text.DateFormat;
+import java.util.GregorianCalendar;
+
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+
+import schmitzm.lang.WorkingThread;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.XuluPlugin;
-import schmitzm.lang.WorkingThread;
-
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.XuluPlugin;
-
/**
* Diese Klasse stellt ein Plugin fuer die Xulu-Applikation dar, welches die
* aktuelle Uhrzeit (und Datum) in einem eigenen (kleinen) Fester anzeigt.
Modified: trunk/src/edu/bonn/xulu/plugin/appl/FileExportHandlerFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/FileExportHandlerFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/FileExportHandlerFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,31 +11,24 @@
package edu.bonn.xulu.plugin.appl;
-import schmitzm.swing.MultipleOptionPane;
+import java.io.File;
+import java.text.DecimalFormat;
+import java.util.Vector;
+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 edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.Handler;
-import edu.bonn.xulu.appl.HandlerFactory;
-import edu.bonn.xulu.appl.VisualisationTool;
import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.io.Factory;
-import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.gui.DataPoolInputOption;
import edu.bonn.xulu.io.ExportFactory;
-import schmitzm.swing.FileInputOption;
-import java.io.File;
-import schmitzm.swing.event.InputOptionAdapter;
-import edu.bonn.xulu.gui.XuluGUIMessages;
-import java.util.Vector;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.io.IOUtil;
-import java.text.DecimalFormat;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import edu.bonn.xulu.model.event.AbstractStepModelEvent;
import edu.bonn.xulu.model.event.AbstractIterationStepEvent;
+import edu.bonn.xulu.model.event.AbstractStepModelEvent;
/**
* Mit dieser Factory werden Instanzen des {@link FileExportHandler}
Modified: trunk/src/edu/bonn/xulu/plugin/appl/GTVisualisationColorMapPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/GTVisualisationColorMapPlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/GTVisualisationColorMapPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,37 +11,32 @@
package edu.bonn.xulu.plugin.appl;
-import java.io.File;
-import java.io.FileReader;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.util.StringTokenizer;
-import java.awt.Color;
-import java.util.Hashtable;
-import java.util.Enumeration;
+import java.awt.Color;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+
+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 edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.VisualisationManager;
+import edu.bonn.xulu.appl.XuluPlugin;
+import edu.bonn.xulu.gui.XuluGUIMessages;
+import edu.bonn.xulu.plugin.vis.GTVisualisationTool;
-import org.geotools.styling.ColorMap;
-import org.geotools.styling.ColorMapImpl;
-
-import schmitzm.io.IOUtil;
-import schmitzm.lang.AbstractNamedObject;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.swing.SwingUtil;
-
-import schmitzm.geotools.gui.LayeredMapFrame;
-import schmitzm.geotools.styling.StylingUtil;
-import schmitzm.geotools.styling.ColorMapManager;
-
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.gui.XuluGUIMessages;
-import edu.bonn.xulu.appl.XuluPlugin;
-import edu.bonn.xulu.appl.XuluPlugin;
-import edu.bonn.xulu.appl.VisualisationManager;
-// nur fuer Doku
-import edu.bonn.xulu.appl.VisualisationTool;
-import edu.bonn.xulu.plugin.vis.GTVisualisationTool;
-
/**
* Dieses Plugin liest Farbpaletten aus der Datei <code>gtcolormaps.xif</code>
* und fuegt sie automatisch den {@link GTVisualisationTool}-Instanzen hinzu,
@@ -189,6 +184,14 @@
continue;
}
+ // Beim Tag TYPE wird die Art der ColorMap festgelegt
+ if ( line.trim().toLowerCase().matches("type\\s*=.*") ) {
+ String[] line_parts = line.toLowerCase().split("type\\s*\\=\\s*");
+ int colorMapType = StylingUtil.getColorMapType(line_parts[1] );
+ colorMap.setType(colorMapType);
+ continue;
+ }
+
// Ansonsten Zeile als ColorMapEntry interpretieren:
// <Quantity> <Color> [<Label>]
if ( colorMap == null )
Modified: trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGenerator.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGenerator.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGenerator.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,43 +11,37 @@
package edu.bonn.xulu.plugin.appl;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.BufferedWriter;
-import java.io.FileWriter;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.Arrays;
+import java.util.Comparator;
+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 edu.bonn.xulu.model.AbstractModelContentManager;
+import edu.bonn.xulu.model.AbstractStepModel;
+import edu.bonn.xulu.model.AbstractXuluModel;
+import edu.bonn.xulu.model.ModelContentManager;
+import edu.bonn.xulu.model.ModelResource;
+import edu.bonn.xulu.model.PropertiesResource;
+import edu.bonn.xulu.model.StepModel;
+import edu.bonn.xulu.model.ValuePropertyResource;
+import edu.bonn.xulu.model.XuluModel;
-import java.util.Vector;
-import java.util.StringTokenizer;
-import java.util.Arrays;
-import java.util.Comparator;
-
-import schmitzm.lang.LangUtil;
-import schmitzm.io.dyntxt.DynamicTextGenerator;
-import schmitzm.io.dyntxt.DynamicInputProvider;
-import schmitzm.io.dyntxt.DynamicField;
-import schmitzm.io.dyntxt.DynamicLoop;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.temp.BaseTypeUtil;
-
-import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.model.AbstractXuluModel;
-import edu.bonn.xulu.model.StepModel;
-import edu.bonn.xulu.model.AbstractStepModel;
-import edu.bonn.xulu.model.AbstractModelContentManager;
-import edu.bonn.xulu.model.ModelResource;
-import edu.bonn.xulu.model.ValuePropertyResource;
-import edu.bonn.xulu.model.PropertiesResource;
-// nur fuer Doku
-import edu.bonn.xulu.model.ModelContentManager;
-
/**
* Diese Klasse stellt einen Sourcecode-Generator dar, mit dem ein Grundgeruest
* fuer {@link XuluModel}- und {@link StepModel}-Klassen (mit entsprechendem
Modified: trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGeneratorGUI.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGeneratorGUI.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGeneratorGUI.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,66 +11,62 @@
package edu.bonn.xulu.plugin.appl;
-import java.io.File;
+import java.awt.Container;
import java.awt.Dimension;
-import java.awt.GridBagLayout;
import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
import java.awt.Insets;
-import java.awt.Container;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import java.awt.event.KeyAdapter;
-import javax.swing.JLabel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextField;
-import javax.swing.JComboBox;
-import javax.swing.JCheckBox;
+import java.io.File;
+import java.util.Vector;
+
+import javax.swing.DefaultCellEditor;
import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
import javax.swing.JFileChooser;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
import javax.swing.ListSelectionModel;
-import javax.swing.DefaultCellEditor;
-import java.util.Vector;
+import javax.swing.table.TableModel;
import org.geotools.feature.FeatureCollection;
import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.data.property.ScalarProperty;
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.SwingUtil;
-import schmitzm.swing.SwingWorker;
+import schmitzm.swing.BooleanInputOption;
+import schmitzm.swing.FileInputOption;
import schmitzm.swing.InputOption;
-import schmitzm.swing.MultipleOptionPane;
import schmitzm.swing.ManualInputOption;
-import schmitzm.swing.FileInputOption;
-import schmitzm.swing.BooleanInputOption;
+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 schmitzm.swing.table.ComponentRenderer;
-
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.gui.XuluInternalFrame;
+import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.gui.XuluGUIMessages;
+import edu.bonn.xulu.gui.XuluInternalFrame;
+import edu.bonn.xulu.model.ModelContentManager;
import edu.bonn.xulu.model.ModelResource;
-import edu.bonn.xulu.model.ValuePropertyResource;
import edu.bonn.xulu.model.PropertiesResource;
import edu.bonn.xulu.model.StepModel;
+import edu.bonn.xulu.model.ValuePropertyResource;
import edu.bonn.xulu.model.XuluModel;
-// nur fuer Doku
-import javax.swing.table.TableModel;
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.model.ModelContentManager;
-import edu.bonn.xulu.plugin.appl.GeoModelCodeGeneratorPlugin;
-
/**
* Diese Klasse stellt eine GUI zur Vefuegung, mit der der {@link GeoModelCodeGenerator}
* gesteuert werden kann. Sie ist als {@linkplain XuluInternalFrame internes}
Modified: trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGeneratorPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGeneratorPlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/GeoModelCodeGeneratorPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,10 +11,8 @@
package edu.bonn.xulu.plugin.appl;
-import schmitzm.lang.LangUtil;
+import edu.bonn.xulu.gui.XuluInternalFrame;
-import edu.bonn.xulu.gui.XuluInternalFrame;
-
/**
* Dieses Plugin integriert die {@link edu.bonn.xulu.plugin.appl.GeoModelCodeGeneratorGUI}
* in das Xulu-Menue "Erweitert".
Modified: trunk/src/edu/bonn/xulu/plugin/appl/LoggerPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/LoggerPlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/LoggerPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,18 +11,15 @@
package edu.bonn.xulu.plugin.appl;
-import java.io.File;
-import javax.swing.JTextField;
-import org.apache.log4j.LogManager;
+import java.io.File;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+
+import schmitzm.swing.log4j.LoggerFrame;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.XuluPlugin;
-import schmitzm.swing.log4j.LoggerFrame;
-
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.XuluPlugin;
-
-// fuer Doku
-import org.apache.log4j.Level;
-
/**
* Dieses Xulu-Plugin zeigt alle im {@link LogManager} registrierten Log4j-Logger an
* und bietet die Möglichkeit, deren {@link Level} zur Laufzeit veraendern.
Modified: trunk/src/edu/bonn/xulu/plugin/appl/ModelResourceMappingScriptInterpreter_Basic.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/ModelResourceMappingScriptInterpreter_Basic.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/ModelResourceMappingScriptInterpreter_Basic.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,24 +11,21 @@
package edu.bonn.xulu.plugin.appl;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.BufferedReader;
-import java.awt.Container;
+import java.awt.Container;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+import schmitzm.io.IOUtil;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.AbstractScriptInterpreter;
+import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.gui.ModelContentManagerContainer;
+import edu.bonn.xulu.gui.ModelControlFrame;
+import edu.bonn.xulu.gui.XuluGUIUtil;
+import edu.bonn.xulu.model.XuluModel;
+import edu.bonn.xulu.plugin.gui.ModelControlFrame_Basic;
-import schmitzm.io.IOUtil;
-
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.AbstractScriptInterpreter;
-import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.gui.ModelControlFrame;
-import edu.bonn.xulu.gui.ModelContentManagerContainer;
-import edu.bonn.xulu.gui.XuluGUIUtil;
-
-// nur fuer Doku
-import edu.bonn.xulu.plugin.gui.ModelControlFrame_Basic;
-
/**
* Dieser Interpreter fuehrt ein Mapping zwischen Datenpool-Objekten und
* Modell-Ressourcen durch und kann <b>nur in Verbindung mit {@link ModelControlFrame_Basic}
Modified: trunk/src/edu/bonn/xulu/plugin/appl/ModelTimeSnifferPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/ModelTimeSnifferPlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/ModelTimeSnifferPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,26 +11,25 @@
package edu.bonn.xulu.plugin.appl;
-import java.util.Vector;
+import java.util.Vector;
+
+import schmitzm.data.event.ObjectEvent;
+import schmitzm.data.event.ObjectListener;
+import schmitzm.lang.AbstractNamedObject;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.ModelControlManager;
+import edu.bonn.xulu.appl.XuluPlugin;
+import edu.bonn.xulu.gui.ModelControlFrame;
+import edu.bonn.xulu.model.XuluModel;
+import edu.bonn.xulu.model.event.ModelEvent;
+import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
+import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
+import edu.bonn.xulu.model.event.ModelListener;
+import edu.bonn.xulu.model.event.ModelStartedEvent;
+import edu.bonn.xulu.model.event.ModelStepFinishedEvent;
+import edu.bonn.xulu.model.event.ModelStepStartedEvent;
+import edu.bonn.xulu.model.event.ModelStoppedEvent;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.XuluPlugin;
-import edu.bonn.xulu.appl.ModelControlManager;
-import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.model.event.ModelListener;
-import edu.bonn.xulu.model.event.ModelEvent;
-import edu.bonn.xulu.model.event.ModelStartedEvent;
-import edu.bonn.xulu.model.event.ModelStoppedEvent;
-import edu.bonn.xulu.model.event.ModelStepStartedEvent;
-import edu.bonn.xulu.model.event.ModelStepFinishedEvent;
-import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
-import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
-import edu.bonn.xulu.gui.ModelControlFrame;
-
-import schmitzm.lang.AbstractNamedObject;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
-
/**
* Dieses Plugin koppelt sich an alle in Xulu geladenen Modelle und
* gibt deren absolute Laufzeit (in Sekunden aus). Bei Step-Modellen wird
Modified: trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorGUI.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorGUI.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorGUI.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,17 +11,14 @@
package edu.bonn.xulu.plugin.appl;
+import java.awt.BorderLayout;
import java.awt.Container;
import java.awt.Dimension;
-import java.awt.BorderLayout;
+import schmitzm.data.RasterCalculator;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.gui.XuluInternalFrame;
-// nur fuer Doku
-import schmitzm.data.RasterCalculator;
-import edu.bonn.xulu.plugin.appl.RasterCalculatorPlugin;
-
/**
* Diese Klasse stellt eine GUI zur Vefuegung, mit der eine einfache arithmetische
* (und boolsche) Berechnung auf Rasterdaten durchgefuehrt werden kann. Zudem
Modified: trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorPanel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorPanel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorPanel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -20,6 +20,8 @@
import java.awt.dnd.DropTargetDropEvent;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
import java.io.File;
import java.io.FileInputStream;
import java.util.Vector;
@@ -27,9 +29,12 @@
import javax.swing.JButton;
import javax.swing.JLabel;
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;
@@ -43,10 +48,11 @@
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 schmitzm.swing.table.MutableTableModel;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.data.DynamicXuluObject;
@@ -56,17 +62,7 @@
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-import schmitzm.swing.OperationTreePanel;
-import schmitzm.swing.SwingUtil;
-// nur fuer Doku
-import schmitzm.data.RasterOperationTree;
-import schmitzm.data.RasterOperationTreeParser;
-import edu.bonn.xulu.plugin.appl.RasterCalculatorPlugin;
-import java.awt.event.MouseAdapter;
-import javax.swing.JTextField;
-import java.awt.event.MouseEvent;
-
/**
* Diese Klasse stellt eine GUI zur Vefuegung, mit der eine einfache arithmetische
* (und boolsche) Berechnung auf Rasterdaten durchgefuehrt werden kann. Zudem
@@ -138,15 +134,9 @@
* durch die Unterklasse erfolgen!)
*/
protected RasterCalculatorPanel(XuluModellingPlatform appl, boolean initGUI) {
- super(false);
+ super(RasterCalculator.RASTER_CALC_PARSER,false);
this.appl = appl;
- // Zusaetzliche Operatoren und Konstanten
- avOperators.add("X"); avOperatorsDesc.put("X", "Raster cell X");
- avOperators.add("Y"); avOperatorsDesc.put("Y", "Raster cell Y");
- avOperators.add("NoData"); avOperatorsDesc.put("NoData", "NoData value");
- avOperators.add("isNoData"); avOperatorsDesc.put("isNoData", "isNoData(.)");
-
// Layout-Anordnung fuer GUI
layoutConstraints.put( INRASTER_LABEL, new GridBagConstraints(0,0,2,1, 0, 0,GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(5,10,0,10),0,0) );
layoutConstraints.put( INRASTER_TABLE, new GridBagConstraints(0,1,2,1,1.0,1.0,GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0,10,5,10),0,0) );
@@ -330,22 +320,7 @@
RasterCalculator.checkRuleAndError(rule.getValue());
}
-
/**
- * Liefert die Anzahl an geklammerten Parametern, die ein Operator hat.
- * Erweitert die Methode der Oberklasse um den Operator {@code isNoData(.)}
- * und die Filter-Referenz {@code F.}.
- * @param op Operator
- * @return 1 fuer {@code isNoData} und {@code F..}, sonst den Wert der {@code super}-Methode
- */
- protected int getParameterCount(String op) {
- // Funktionen mit einem geklammerten Parameter
- if (op.equalsIgnoreCase("isNoData") || op.charAt(0) == 'F')
- return 1;
- return super.getParameterCount(op);
- }
-
- /**
* Laed Standard-Filter aus der Datei {@code <Plugin-Dir>\RasterCalculator\default_filter.inp}
* in den Datenpool.
* @see #DEFAULT_FILTER_FILENAME
@@ -469,7 +444,7 @@
}
return null;
}
-
+
///////////////////////////////////////////////////////////////////
///////////////// Table fuer die DnD-Tabellen /////////////////
///////////////////////////////////////////////////////////////////
Modified: trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorPlugin.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorPlugin.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/RasterCalculatorPlugin.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,8 +11,6 @@
package edu.bonn.xulu.plugin.appl;
-import schmitzm.lang.LangUtil;
-
import edu.bonn.xulu.gui.XuluInternalFrame;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandler.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandler.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandler.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,12 +11,12 @@
package edu.bonn.xulu.plugin.appl;
-import schmitzm.data.event.ObjectEvent;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.AbstractHandler;
-import edu.bonn.xulu.appl.VisualisationTool;
-import edu.bonn.xulu.gui.XuluGUIMessages;
-import edu.bonn.xulu.data.XuluObject;
+import schmitzm.data.event.ObjectEvent;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.AbstractHandler;
+import edu.bonn.xulu.appl.VisualisationTool;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.gui.XuluGUIMessages;
/**
* Diese Klasse stellt einen Handler dar, mit dem die Visualisierung eines
Modified: trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandlerFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandlerFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/VisualisationHandlerFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,19 +11,17 @@
package edu.bonn.xulu.plugin.appl;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.SelectionInputOption;
+import schmitzm.swing.InputOption;
+import schmitzm.swing.MultipleOptionPane;
+import schmitzm.swing.SelectionInputOption;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.Handler;
+import edu.bonn.xulu.appl.HandlerFactory;
+import edu.bonn.xulu.appl.VisualisationTool;
+import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.gui.DataPoolInputOption;
+import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.Handler;
-import edu.bonn.xulu.appl.HandlerFactory;
-import edu.bonn.xulu.appl.VisualisationTool;
-import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.io.Factory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.gui.DataPoolInputOption;
-
/**
* Mit dieser Factory werden Instanzen des {@link VisualisationHandler}
* erstellt und modifiziert. Die benoetigten Informationen (darzustellendes
Modified: trunk/src/edu/bonn/xulu/plugin/appl/XuluRegistryReader_BasicAscii.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/appl/XuluRegistryReader_BasicAscii.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/appl/XuluRegistryReader_BasicAscii.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,35 +11,28 @@
package edu.bonn.xulu.plugin.appl;
+import java.io.BufferedReader;
+import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.IOException;
-import java.io.BufferedReader;
-import java.util.StringTokenizer;
-import java.util.NoSuchElementException;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.net.MalformedURLException;
+import java.util.NoSuchElementException;
+import java.util.StringTokenizer;
import schmitzm.io.IOUtil;
-import schmitzm.lang.NamedObject;
import schmitzm.lang.LangUtil;
-
+import schmitzm.lang.NamedObject;
import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.TypeMapping;
-
-import edu.bonn.xulu.appl.XuluPlugin;
import edu.bonn.xulu.appl.ScriptInterpreter;
+import edu.bonn.xulu.appl.VisualisationTool;
+import edu.bonn.xulu.appl.XuluPlugin;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.appl.XuluRegistryReader;
-
-
-// nur fuer Doku
import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.appl.VisualisationTool;
+import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.ImportFactory;
+import edu.bonn.xulu.io.InstantiationFactory;
+import edu.bonn.xulu.io.TypeMapping;
import edu.bonn.xulu.model.XuluModel;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/data/grid/MultiGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/data/grid/MultiGrid.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/data/grid/MultiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,16 +11,16 @@
package edu.bonn.xulu.plugin.data.grid;
+import java.awt.image.DataBuffer;
+
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import schmitzm.data.AbstractWritableGrid;
import schmitzm.data.WritableGrid;
-import schmitzm.data.AbstractWritableGrid;
import schmitzm.data.property.ScalarProperty;
+import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-// nur fuer Doku
-import java.awt.image.DataBuffer;
-
/**
* Dieser Datentyp stellt eine Liste von Rastern ({@link WritableGrid} da.
* In der Liste koennen nur gleichartige Raster (gleiche Groesse und gleiche
Modified: trunk/src/edu/bonn/xulu/plugin/data/grid/SingleGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/data/grid/SingleGrid.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/data/grid/SingleGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -14,7 +14,6 @@
import schmitzm.data.WritableGrid;
import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ValuePropertyAccessParameters;
import edu.bonn.xulu.data.AbstractXuluObject;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/data/misc/CASettlementArea.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/data/misc/CASettlementArea.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/data/misc/CASettlementArea.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,9 +11,6 @@
package edu.bonn.xulu.plugin.data.misc;
-import java.awt.Point;
-import java.awt.geom.Point2D;
-import java.util.Vector;
/**
* Dieser Datentyp erweitert die allgemeine {@linkplain CAArea CA-Region} um
Modified: trunk/src/edu/bonn/xulu/plugin/gui/AbstractManagerFrame_BasicTable.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/AbstractManagerFrame_BasicTable.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/AbstractManagerFrame_BasicTable.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,31 +11,24 @@
package edu.bonn.xulu.plugin.gui;
-import java.awt.Dimension;
-import java.awt.BorderLayout;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import javax.swing.JScrollPane;
-import javax.swing.JButton;
-//import javax.swing.JTable;
-//import javax.swing.table.AbstractTableModel;
-
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+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.TableComponentMouseListener;
-import schmitzm.swing.table.MutableTable;
-import schmitzm.swing.table.MutableTableModel;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
+import schmitzm.swing.table.ComponentRenderer;
+import schmitzm.swing.table.MutableTable;
+import schmitzm.swing.table.MutableTableModel;
+import schmitzm.swing.table.TableComponentMouseListener;
+import edu.bonn.xulu.appl.AbstractManager;
+import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.gui.AbstractManagerFrame;
-import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.appl.AbstractManager;
-import edu.bonn.xulu.appl.AbstractManager.ChangeEvent;
-import edu.bonn.xulu.gui.AbstractManagerFrame;
-import edu.bonn.xulu.gui.XuluGUIMessages;
-
/**
* Diese Klasse stellt eine GUI-Komponente fuer den {@link AbstractManager}
* dar. In dieser werden die darin registrierten Komponenten tabellarisch
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_BasicTable.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_BasicTable.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_BasicTable.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,39 +11,29 @@
package edu.bonn.xulu.plugin.gui;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.BorderLayout;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import javax.swing.JFileChooser;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.table.AbstractTableModel;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.io.File;
-//import java.io.FileInputStream;
-//import java.io.FileOutputStream;
-
-import schmitzm.swing.MultiSplitPane;
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.Enumeration;
+import java.util.Vector;
-import schmitzm.swing.event.PopupMenuListener;
+import javax.swing.JScrollPane;
+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 edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.DataPool;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.gui.DataPoolFrame;
+import edu.bonn.xulu.gui.DataPoolMenu;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.property.Property;
-
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.DataPool;
-
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.gui.DataPoolFrame;
-import edu.bonn.xulu.gui.DataPoolMenu;
-import edu.bonn.xulu.plugin.gui.DisplayContainer_Properties;
-
/**
* Dieses Fenster stellt die grafische Implementierung des Xulu-Datenpools
* dar. Es visualiert den Datenpool tabellarisch durch zwei Komponenten:
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_Tree.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_Tree.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DataPoolFrame_Tree.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,73 +11,37 @@
package edu.bonn.xulu.plugin.gui;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.BorderLayout;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import javax.swing.JFileChooser;
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.TreePath;
-import javax.swing.JTable;
-import javax.swing.table.AbstractTableModel;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.io.File;
-
-import schmitzm.io.FileInputStream;
-import schmitzm.io.FileOutputStream;
-import schmitzm.lang.AlreadyHandledException;
+import java.awt.BorderLayout;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.EventObject;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.tree.DefaultTreeCellEditor;
+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.menu.ObjectMenuItem;
-import schmitzm.swing.tree.EmptyNode;
-import schmitzm.swing.tree.ContentNode;
-import schmitzm.swing.tree.EditableNode;
+import schmitzm.swing.ObjectDisplayContainer;
+import schmitzm.swing.event.PopupMenuListener;
+import schmitzm.swing.tree.ContentNode;
+import schmitzm.swing.tree.EditableNode;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.gui.DataPoolFrame;
+import edu.bonn.xulu.gui.DataPoolMenu;
+import edu.bonn.xulu.gui.DataPoolTreeModel;
+import edu.bonn.xulu.gui.XuluGUIMessages;
-import schmitzm.data.ObjectStructure;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.PropertyType;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.data.property.ValuePropertyType;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.AccessViolationException;
-
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.DataPool;
-import edu.bonn.xulu.appl.VisualisationTool;
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.gui.XuluGUIMessages;
-import edu.bonn.xulu.gui.XuluMainFrame;
-import edu.bonn.xulu.gui.DataPoolMenu;
-import edu.bonn.xulu.gui.DataPoolFrame;
-import edu.bonn.xulu.gui.DataPoolTreeModel;
-
-import schmitzm.temp.BaseTypeUtil;
-
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.DefaultTreeCellEditor;
-import javax.swing.event.TreeSelectionEvent;
-import java.util.EventObject;
-
/**
* Diese Klasse stellt den Xulu-Datenpool als Baum dar, in der die Datenstrukturen
* der einzelnen Objekte aufgeschluesselt werden.<br>
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_GeomAndGrid.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_GeomAndGrid.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_GeomAndGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -23,7 +23,7 @@
import org.opengis.geometry.Envelope;
import schmitzm.geotools.feature.FeatureUtil;
-import schmitzm.geotools.gui.JMapPane;
+import schmitzm.geotools.gui.SelectableXMapPane;
import schmitzm.swing.ObjectDisplayContainer;
/**
@@ -33,12 +33,12 @@
* <li>{@link GridCoverage2D}</li>
* <li>{@link FeatureCollection}</li>
* </ul>
- * @see JMapPane
+ * @see SelectableXMapPane
* @author <a href="mailto:martin.schmitz at koeln.de">Martin Schmitz</a> (University of Bonn/Germany)
* @version 1.0
*/
public class DisplayContainer_GeomAndGrid extends ObjectDisplayContainer {
- private JMapPane map = null;
+ private SelectableXMapPane map = null;
/**
* Erzeugt eine neue Darstellungskomponente.
@@ -55,7 +55,7 @@
public DisplayContainer_GeomAndGrid(Object data) {
super();
this.setLayout(new BorderLayout());
- this.map = new JMapPane();
+ this.map = new SelectableXMapPane();
this.map.setSize(100,100);
this.add(map, BorderLayout.CENTER);
this.doLayout();
@@ -80,10 +80,10 @@
if (map != null) {
// aktuelle Darstellung (Position/Zoom) merken, um nachher den
// das neue Layer in diesen Einstellungen anzuzeigen
- com.vividsolutions.jts.geom.Envelope oldArea = ( map.getContext().getLayerCount() > 0 ) ? map.getMapArea() : null;
+ com.vividsolutions.jts.geom.Envelope oldArea = ( map.getMapContext().getLayerCount() > 0 ) ? map.getMapArea() : null;
com.vividsolutions.jts.geom.Envelope newArea = null;
// alte Layer entfernen
- map.getContext().clearLayerList();
+ map.getMapContext().clearLayerList();
// neues Layer einfuegen
if ( data instanceof GridCoverage2D ) {
@@ -99,7 +99,7 @@
rasterSymb.setColorMap( colMap );
Style rasterStyle = builder.createStyle( rasterSymb );
- map.getContext().addLayer( (GridCoverage2D) data, rasterStyle );
+ map.getMapContext().addLayer( (GridCoverage2D) data, rasterStyle );
// Versuch, die Farbe nachtraeglich zu aktualisieren:
// colMap = builder.createColorMap(
@@ -124,13 +124,12 @@
// ###### FEATURECOLLECTION ######
FeatureCollection fc = (FeatureCollection) data;
Style fcStyle = FeatureUtil.createDefaultStyle(fc);
- map.getContext().addLayer( fc, fcStyle );
+ map.getMapContext().addLayer( fc, fcStyle );
// neuer Anzeigebereich: Die komplette FeatureCollection
newArea = (fc.getBounds());
}
map.setMapArea( newArea );
- map.setReset(true);
map.repaint();
}
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_ListProperty.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_ListProperty.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_ListProperty.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,22 +11,13 @@
package edu.bonn.xulu.plugin.gui;
-import java.awt.BorderLayout;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
+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 edu.bonn.xulu.gui.XuluGUIMessages;
-import schmitzm.swing.ObjectDisplayContainer;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.AccessViolationException;
-
-import edu.bonn.xulu.gui.XuluGUIMessages;
-
-import schmitzm.temp.BaseTypeUtil;
-
/**
* Diese Klasse stellt eine GUI-Komponente dar, in der eine
* {@link ListProperty}-Instanz angezeigt werden kann. Die einzelnen Listen-Elemente
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_MatrixProperty.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_MatrixProperty.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_MatrixProperty.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,21 +11,20 @@
package edu.bonn.xulu.plugin.gui;
-import java.util.Vector;
-import java.awt.Component;
-import javax.swing.JTable;
-import javax.swing.JLabel;
-import javax.swing.ListSelectionModel;
-import javax.swing.table.DefaultTableCellRenderer;
+import java.awt.Component;
+import java.util.Vector;
+
+import javax.swing.JLabel;
+import javax.swing.JTable;
+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 edu.bonn.xulu.gui.XuluGUIMessages;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.AccessViolationException;
-
-import edu.bonn.xulu.gui.XuluGUIMessages;
-
-import schmitzm.temp.BaseTypeUtil;
-
/**
* Diese Klasse stellt eine GUI-Komponente dar, in der eine
* 2-dimensionale (m,n)-{@link MatrixProperty} angezeigt werden kann.
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Properties.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Properties.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Properties.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,23 +11,15 @@
package edu.bonn.xulu.plugin.gui;
-import java.awt.BorderLayout;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
+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 edu.bonn.xulu.gui.XuluGUIMessages;
-import schmitzm.swing.ObjectDisplayContainer;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.PropertySet;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.AccessViolationException;
-
-import edu.bonn.xulu.gui.XuluGUIMessages;
-
-import schmitzm.temp.BaseTypeUtil;
-
/**
* Diese Klasse stellt eine GUI-Komponente dar, in der eine
* {@link Properties}-Instanz angezeigt werden kann. Die einzelnen Eigenschaften
Modified: trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Table.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Table.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/DisplayContainer_Table.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,23 +11,14 @@
package edu.bonn.xulu.plugin.gui;
-import java.awt.BorderLayout;
-import javax.swing.table.AbstractTableModel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.table.TableModel;
-import javax.swing.ListSelectionModel;
+import java.awt.BorderLayout;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.AbstractTableModel;
+
+import schmitzm.swing.ObjectDisplayContainer;
-import schmitzm.swing.ObjectDisplayContainer;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.property.AccessViolationException;
-
-import edu.bonn.xulu.gui.XuluGUIMessages;
-
-import schmitzm.temp.BaseTypeUtil;
-
/**
* Diese Klasse stellt eine abstrakte Oberklasse fuer die Darstellung
* von tabellarischen <code>ObjectDisplayContainer</code> dar.
Modified: trunk/src/edu/bonn/xulu/plugin/gui/EventManagerFrame_BasicTable.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/EventManagerFrame_BasicTable.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/EventManagerFrame_BasicTable.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,39 +11,26 @@
package edu.bonn.xulu.plugin.gui;
-import java.awt.Dimension;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.MutableTreeNode;
+import java.awt.Dimension;
+
+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 edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.AbstractManager;
+import edu.bonn.xulu.appl.EventHandler;
+import edu.bonn.xulu.appl.EventManager;
+import edu.bonn.xulu.appl.Handler;
+import edu.bonn.xulu.appl.HandlerFactory;
+import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.gui.ObjectOrModelInputOption;
+import edu.bonn.xulu.gui.XuluGUIMessages;
-import schmitzm.swing.TreeSelectionDialog;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.SelectionInputOption;
-import schmitzm.swing.event.InputOptionAdapter;
-import schmitzm.swing.table.MutableTable;
-import schmitzm.swing.tree.EmptyNode;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.DataPool;
-import edu.bonn.xulu.appl.ModelControlManager;
-import edu.bonn.xulu.appl.Handler;
-import edu.bonn.xulu.appl.HandlerFactory;
-import edu.bonn.xulu.appl.EventHandler;
-import edu.bonn.xulu.appl.EventManager;
-
-import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.gui.DataPoolTreeModel;
-import edu.bonn.xulu.gui.DataPoolInputOption;
-import edu.bonn.xulu.gui.ObjectOrModelInputOption;
-import edu.bonn.xulu.gui.ModelManagerTreeModel;
-import edu.bonn.xulu.gui.XuluGUIMessages;
-
-import edu.bonn.xulu.plugin.gui.AbstractManagerFrame_BasicTable;
-
-// nur fuer Doku
-import javax.swing.JInternalFrame;
-
-
/**
* Diese Klasse stellt eine GUI fuer den {@linkplain EventManager Xulu-EventManager}
* dar. Diese stellt (in einem {@link JInternalFrame}) tabellarisch alle {@link EventHandler}
Modified: trunk/src/edu/bonn/xulu/plugin/gui/ModelControlContainer.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/ModelControlContainer.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/ModelControlContainer.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,26 +12,24 @@
package edu.bonn.xulu.plugin.gui;
import java.awt.Container;
-import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
+
import javax.swing.BoxLayout;
import javax.swing.JButton;
-import java.util.Vector;
import schmitzm.lang.WorkingThread;
-import schmitzm.lang.WorkingThreadListener;
import schmitzm.lang.WorkingThreadAdapter;
-import edu.bonn.xulu.model.XuluModel;
+import schmitzm.lang.WorkingThreadListener;
+import appl.plugin.multimodelcontrol.MultiModelControlPlugin;
+import edu.bonn.xulu.gui.XuluGUIMessages;
import edu.bonn.xulu.model.StepModel;
-import edu.bonn.xulu.model.event.ModelAdapter;
-import edu.bonn.xulu.model.XuluModelThread;
import edu.bonn.xulu.model.StepModelThread;
+import edu.bonn.xulu.model.XuluModel;
+import edu.bonn.xulu.model.XuluModelThread;
+import edu.bonn.xulu.model.event.ModelAdapter;
-import edu.bonn.xulu.gui.XuluGUIMessages;
-
-// fuer doku
-import appl.plugin.multimodelcontrol.MultiModelControlPlugin;
-
/**
* Diese Klasse stellt einen Container dar, ueber den der Modellablauf gesteuert
* werden kann. Hierzu enthaelt er 5 Buttons
Modified: trunk/src/edu/bonn/xulu/plugin/gui/ModelControlFrame_Basic.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/ModelControlFrame_Basic.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/ModelControlFrame_Basic.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,47 +12,42 @@
package edu.bonn.xulu.plugin.gui;
import java.awt.BorderLayout;
-
-import java.awt.GridBagLayout;
+import java.awt.Component;
+import java.awt.Container;
import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
import java.awt.Insets;
-import java.awt.Container;
-import java.awt.Component;
-import java.awt.Point;
-import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.PrintStream;
import java.util.Vector;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JLabel;
+
import javax.swing.JButton;
import javax.swing.JFrame;
-import javax.swing.JMenuItem;
+import javax.swing.JLabel;
import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import schmitzm.lang.LangUtil;
import schmitzm.lang.WorkingThread;
import schmitzm.lang.WorkingThreadAdapter;
-import schmitzm.lang.LangUtil;
import schmitzm.swing.SwingUtil;
import schmitzm.swing.TextAreaPrintStream;
import schmitzm.swing.event.PopupMenuListener;
+import appl.plugin.multimodelcontrol.MultiModelControlPlugin;
import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.XuluConstants;
import edu.bonn.xulu.appl.EventHandler;
-import edu.bonn.xulu.appl.AbstractManager;
import edu.bonn.xulu.appl.EventManager;
-
+import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.data.XuluDataException;
+import edu.bonn.xulu.gui.ModelContentManagerContainer;
import edu.bonn.xulu.gui.ModelControlFrame;
import edu.bonn.xulu.gui.XuluGUIMessages;
+import edu.bonn.xulu.model.ModelContentManager;
import edu.bonn.xulu.model.XuluModel;
-import edu.bonn.xulu.plugin.gui.ModelControlContainer;
-import edu.bonn.xulu.gui.ModelContentManagerContainer;
-import edu.bonn.xulu.data.XuluDataException;
-// nur fuer Doku
-import edu.bonn.xulu.model.ModelContentManager;
-import appl.plugin.multimodelcontrol.MultiModelControlPlugin;
-
/**
* Diese Klasse stellt ein Fenster, ueber welches ein Modell gesteuert werden
* kann. Es besteht im wesentlichen aus 3 Bereichen:
Modified: trunk/src/edu/bonn/xulu/plugin/gui/PluginManagerFrame_BasicTable.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/PluginManagerFrame_BasicTable.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/PluginManagerFrame_BasicTable.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,31 +11,26 @@
package edu.bonn.xulu.plugin.gui;
-import java.awt.Dimension;
-import java.awt.BorderLayout;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import javax.swing.JScrollPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.JButton;
-
-import schmitzm.swing.StoplightContainer;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+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.MutableTable;
-import schmitzm.swing.table.MutableTableModel;
-import schmitzm.swing.table.ComponentRenderer;
-import schmitzm.swing.table.TableComponentMouseListener;
+import schmitzm.swing.table.ComponentRenderer;
+import schmitzm.swing.table.MutableTable;
+import schmitzm.swing.table.TableComponentMouseListener;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.appl.XuluPlugin;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.gui.XuluInternalFrame;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.appl.XuluRegistry;
-import edu.bonn.xulu.appl.XuluPlugin;
-import edu.bonn.xulu.gui.XuluInternalFrame;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.GeneralObjectChangeEvent;
-
/**
* Diese Klasse stellt das Xulu-internes Fenster dar, in dem alle aktiven
* (in der Xulu-Registry registrierten) {@linkplain XuluPlugin Xulu-Plugins}
Modified: trunk/src/edu/bonn/xulu/plugin/gui/RegistryFrame_Tree.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/RegistryFrame_Tree.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/RegistryFrame_Tree.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,38 +11,36 @@
package edu.bonn.xulu.plugin.gui;
-import java.awt.BorderLayout;
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
-import javax.swing.tree.MutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.DefaultTreeCellEditor;
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.TreeSelectionModel;
-import javax.swing.event.TreeSelectionEvent;
-import java.util.EventObject;
+import java.awt.BorderLayout;
+import java.util.EventObject;
+
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.tree.DefaultTreeCellEditor;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.DefaultTreeModel;
+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 edu.bonn.xulu.appl.ScriptInterpreter;
+import edu.bonn.xulu.appl.XuluPlugin;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.gui.RegistryFrame;
+import edu.bonn.xulu.gui.XuluGUIMessages;
+import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.Factory;
+import edu.bonn.xulu.io.ImportFactory;
+import edu.bonn.xulu.io.InstantiationFactory;
+import edu.bonn.xulu.io.TypeMapping;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.lang.NamedObject;
-import schmitzm.lang.AlreadyHandledException;
-import schmitzm.swing.tree.EditableNode;
-import schmitzm.swing.tree.EmptyNode;
-import schmitzm.swing.tree.EmptyInnerNode;
-import schmitzm.swing.tree.ContentNode;
-
-import edu.bonn.xulu.io.Factory;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.TypeMapping;
-import edu.bonn.xulu.appl.XuluRegistry;
-import edu.bonn.xulu.appl.ScriptInterpreter;
-import edu.bonn.xulu.appl.XuluPlugin;
-import edu.bonn.xulu.appl.VisualisationTool;
-import edu.bonn.xulu.gui.XuluGUIMessages;
-import edu.bonn.xulu.gui.RegistryFrame;
-
/**
* Dieses Fenster stellt die Visualisierung der {@link edu.bonn.xulu.appl.XuluRegistry}
* dar. Es stellt deren gesamten Inhalt in einer Baumstruktur dar.
Modified: trunk/src/edu/bonn/xulu/plugin/gui/StatusFrame_BasicTextArea.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/gui/StatusFrame_BasicTextArea.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/gui/StatusFrame_BasicTextArea.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,21 +11,21 @@
package edu.bonn.xulu.plugin.gui;
-import javax.swing.JTextArea;
-import javax.swing.JScrollPane;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import java.io.OutputStream;
-import java.io.PrintStream;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.io.PrintStream;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+
+import schmitzm.swing.event.PopupMenuListener;
+import edu.bonn.xulu.XuluModellingPlatform;
+import edu.bonn.xulu.gui.StatusFrame;
-import schmitzm.swing.event.PopupMenuListener;
-import edu.bonn.xulu.XuluModellingPlatform;
-import edu.bonn.xulu.gui.StatusFrame;
-
/**
* Diese Klasse stellt ein Fenster fuer die Xulu-Modelling-Platform dar, in
* dem beliebige Statusmeldungen ausgegeben werden koennen. Dies kann ueber
Modified: trunk/src/edu/bonn/xulu/plugin/io/IOUtil.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/IOUtil.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/IOUtil.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,22 +11,15 @@
package edu.bonn.xulu.plugin.io;
-import java.io.File;
-
import java.net.URL;
import schmitzm.data.property.Property;
import schmitzm.data.property.ScalarProperty;
-
-import edu.bonn.xulu.data.XuluObject;
-
import skrueger.geotools.StyledLayerStyle;
import skrueger.geotools.StyledLayerUtil;
-
-// fuer Doku
-import edu.bonn.xulu.io.ImportFactory;
+import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
+import edu.bonn.xulu.io.ImportFactory;
/**
* Diese Klasse enthaelt statische Hilfs-Methoden fuer das Importieren und
Modified: trunk/src/edu/bonn/xulu/plugin/io/feature/gt/SingleFeatureCollectionFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/feature/gt/SingleFeatureCollectionFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/feature/gt/SingleFeatureCollectionFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,12 +11,12 @@
package edu.bonn.xulu.plugin.io.feature.gt;
+import org.geotools.feature.FeatureCollection;
+import org.geotools.feature.FeatureCollections;
+
+import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.plugin.data.feature.SingleFeatureCollection;
-import org.geotools.feature.FeatureCollections;
-// nur fuer Doku
-import org.geotools.feature.FeatureCollection;
/**
* Diese Factory erzeugt Standard-Instanzen von {@link SingleFeatureCollection}.
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/feature/gt/SingleFeatureCollectionFactory_ShapeFile.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,16 +13,15 @@
import java.io.File;
-import schmitzm.geotools.io.GeoImportUtil;
import schmitzm.geotools.io.GeoExportUtil;
-
-import edu.bonn.xulu.io.ImportFactory;
+import schmitzm.geotools.io.GeoImportUtil;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.plugin.io.IOUtil;
import edu.bonn.xulu.plugin.data.feature.SingleFeatureCollection;
-import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.plugin.io.IOUtil;
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/WritableGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/WritableGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/WritableGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,24 +11,22 @@
package edu.bonn.xulu.plugin.io.grid;
-import java.awt.image.DataBuffer;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import java.awt.image.DataBuffer;
+
+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 edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.FactoryCanceledException;
+import edu.bonn.xulu.io.InstantiationFactory;
+import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-import schmitzm.data.WritableGrid;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.SelectionInputOption;
-import schmitzm.swing.ManualInputOption;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.geotools.io.GeoImportUtil;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.io.FactoryCanceledException;
-import edu.bonn.xulu.appl.XuluConstants;
-
-// nur fuer Doku
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-
/**
* Diese Klasse bildet eine Oberklasse fuer alle Factorys, die Standard-Instanzen
* des Datentyps {@link WritableGrid} erzeugen.<br>
@@ -118,7 +116,7 @@
*/
public WritableGrid newInstance(boolean dialog, int type, int wCells, int hCells, double xCoord, double yCoord, double wReal, double hReal, CoordinateReferenceSystem crs) {
if ( crs == null )
- crs = GeoImportUtil.DEFAULT_CRS;
+ crs = GeoImportUtil.getDefaultCRS();
// Sample-Angaben ohne Dialog uebernehmen
if ( !dialog )
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,12 +11,10 @@
package edu.bonn.xulu.plugin.io.grid.array;
-import edu.bonn.xulu.io.InstantiationFactory;
+import schmitzm.data.WritableGrid;
+import edu.bonn.xulu.io.InstantiationFactory;
+import edu.bonn.xulu.plugin.data.grid.GridList;
-// nur fuer Doku
-import schmitzm.data.WritableGrid;
-import edu.bonn.xulu.plugin.data.grid.GridList;
-
/**
* Diese Factory erzeugt Standard-Instanzen von {@link GridList} mit
* durch die Factory {@link WritableGridArrayFactory} erzeugten (auf Standard-Arrays
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/GridListFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,17 +13,15 @@
import java.io.File;
-import schmitzm.io.IOUtil;
import schmitzm.data.WritableGridArray;
import schmitzm.data.property.ListProperty;
import schmitzm.data.property.ListPropertyReadAccess;
-
+import schmitzm.io.IOUtil;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.GridList;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/MultiGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/MultiGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/MultiGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,10 +11,9 @@
package edu.bonn.xulu.plugin.io.grid.array;
-import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-// nur fuer Doku
-import schmitzm.data.WritableGrid;
-import edu.bonn.xulu.plugin.data.grid.MultiGrid;
+import schmitzm.data.WritableGrid;
+import edu.bonn.xulu.plugin.data.grid.MultiGrid;
+import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
/**
* Diese Factory erzeugt Standard-Instanzen von {@link MultiGrid} mit
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/MultiGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -14,19 +14,12 @@
import java.io.File;
import schmitzm.data.WritableGrid;
-
+import schmitzm.data.WritableGridArray;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
-
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import edu.bonn.xulu.plugin.data.grid.GridList;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-import edu.bonn.xulu.plugin.io.grid.array.GridListFactory_ArcInfoAsciiGrid;
-// nur fuer Doku
-import schmitzm.data.WritableGridArray;
-import edu.bonn.xulu.io.InstantiationFactory;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link MultiGrid} aus/in Dateien im ArcInfo-ASCII-Grid-Format.
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,11 +11,9 @@
package edu.bonn.xulu.plugin.io.grid.array;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
-// nur fuer Doku
-import schmitzm.data.WritableGrid;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
+import schmitzm.data.WritableGrid;
+import edu.bonn.xulu.io.InstantiationFactory;
+import edu.bonn.xulu.plugin.data.grid.SingleGrid;
/**
* Diese Factory erzeugt Standard-Instanzen von {@link SingleGrid} mit einem
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -14,15 +14,12 @@
import java.io.File;
import schmitzm.data.WritableGridArray;
-
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-
import edu.bonn.xulu.plugin.io.IOUtil;
// nur fuer Doku
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/SingleGridFactory_GeoTiff.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -14,13 +14,11 @@
import java.io.File;
import schmitzm.data.WritableGridArray;
-
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.IOUtil;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,19 +11,16 @@
package edu.bonn.xulu.plugin.io.grid.array;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.DataBuffer;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.DataBuffer;
+
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
+import schmitzm.data.WritableGridArray;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.plugin.data.grid.SingleGrid;
+import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridArray;
-import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-import edu.bonn.xulu.appl.XuluConstants;
-// nur fuer Doku
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-
/**
* Diese Factory erzeugt Standard-Instanzen des Datentyps {@link WritableGridArray}.<br>
* <b>Bemerke:</b><br>
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,30 +13,20 @@
import java.io.File;
-import java.lang.reflect.Array;
-import java.util.Arrays;
-
-import org.geotools.coverage.grid.GridCoverageFactory;
import org.geotools.coverage.grid.GridCoverage2D;
+import org.geotools.coverage.grid.GridCoverageFactory;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import schmitzm.data.WritableGridArray;
-import schmitzm.data.WritableGridArray.Float;
-import schmitzm.data.WritableGridArray.Double;
-import schmitzm.data.WritableGridArray.Integer;
import schmitzm.geotools.GTUtil;
-import schmitzm.geotools.io.GeoImportUtil;
import schmitzm.geotools.io.GeoExportUtil;
-
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
+import schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
-
-// nur fuer Doku
import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-import org.geotools.geometry.Envelope2D;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/array/WritableGridArrayFactory_GeoTiff.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,27 +13,20 @@
import java.io.File;
+import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.coverage.grid.GridCoverageFactory;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import schmitzm.data.WritableGridArray;
-import schmitzm.data.WritableGridArray.Float;
-import schmitzm.data.WritableGridArray.Double;
-import schmitzm.data.WritableGridArray.Integer;
import schmitzm.geotools.GTUtil;
-import schmitzm.geotools.io.GeoImportUtil;
import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.grid.WritableGridCoverage;
-
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
+import schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
-
-// nur fuer Doku
import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-import org.geotools.coverage.grid.GridCoverage2D;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,13 +12,13 @@
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 edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.FactoryCanceledException;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.FactoryCanceledException;
import edu.bonn.xulu.plugin.data.grid.GridList;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.ManualInputOption;
/**
* Diese Factory erzeugt Standard-Instanzen von {@link GridList} mit
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/GridListFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,24 +13,22 @@
import java.io.File;
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.io.IOUtil;
+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 edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.plugin.data.grid.GridList;
-// fuer Doku
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link GridList} aus/in Dateien im ArcInfo-ASCII-Grid-Format.
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/MultiGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/MultiGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/MultiGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,16 +12,16 @@
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 edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.FactoryCanceledException;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.FactoryCanceledException;
-import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-import schmitzm.swing.MultipleOptionPane;
-import schmitzm.swing.InputOption;
-import schmitzm.swing.ManualInputOption;
/**
* Diese Factory erzeugt Standard-Instanzen von {@link MultiGrid} mit
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/MultiGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,22 +13,17 @@
import java.io.File;
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.data.WritableGrid;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import schmitzm.data.WritableGrid;
+import schmitzm.data.WritableGridRaster;
+import schmitzm.geotools.io.GeoImportUtil;
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
-
+import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import edu.bonn.xulu.plugin.data.grid.GridList;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-import edu.bonn.xulu.plugin.io.grid.awt.GridListFactory_ArcInfoAsciiGrid;
-// nur fuer Doku
-import schmitzm.data.WritableGridRaster;
-import edu.bonn.xulu.io.InstantiationFactory;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link MultiGrid} aus/in Dateien im ArcInfo-ASCII-Grid-Format.
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -15,8 +15,6 @@
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-import edu.bonn.xulu.plugin.io.grid.awt.WritableGridRasterFactory;
-import schmitzm.data.property.ScalarProperty;
/**
* Diese Factory erzeugt Standard-Instanzen von {@link SingleGrid} mit einem
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,26 +13,20 @@
import java.io.File;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
import schmitzm.data.WritableGrid;
import schmitzm.data.WritableGridRaster;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.geotools.io.GeoImportUtil;
import schmitzm.geotools.io.GeoExportUtil;
-
-import skrueger.geotools.StyledLayerUtil;
-
+import schmitzm.geotools.io.GeoImportUtil;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.IOUtil;
-// fuer Doku
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link SingleGrid} aus/in das ArcInfo-ASCII-Grid-Format.
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/SingleGridFactory_GeoTiff.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,27 +13,20 @@
import java.io.File;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
import schmitzm.data.WritableGrid;
import schmitzm.data.WritableGridRaster;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.geotools.io.GeoImportUtil;
import schmitzm.geotools.io.GeoExportUtil;
-
-import skrueger.geotools.StyledLayerUtil;
-
+import schmitzm.geotools.io.GeoImportUtil;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.IOUtil;
-
-// fuer Doku
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link SingleGrid} aus/in das GeoTiff-Format.
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,17 +11,15 @@
package edu.bonn.xulu.plugin.io.grid.awt;
-import java.awt.geom.Rectangle2D;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import java.awt.geom.Rectangle2D;
+
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
+import schmitzm.data.WritableGridRaster;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.plugin.data.grid.SingleGrid;
+import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.WritableGridRaster;
-import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-
-// nur fuer Doku
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-
/**
* Diese Factory erzeugt Standard-Instanzen des Datentyps {@link WritableGridRaster}.<br>
* <b>Bemerke:</b><br>
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,23 +11,20 @@
package edu.bonn.xulu.plugin.io.grid.awt;
-import java.io.File;
+import java.io.File;
+
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
+import schmitzm.data.WritableGridRaster;
+import schmitzm.geotools.io.GeoExportUtil;
+import schmitzm.geotools.io.GeoImportUtil;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.ImportFactory;
+import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-import schmitzm.data.WritableGridRaster;
-
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.geotools.io.GeoExportUtil;
-
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
-// nur fuer Doku
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link WritableGridRaster} aus/in das ArcInfo-ASCII-Grid-Format.<br>
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/awt/WritableGridRasterFactory_GeoTiff.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,23 +11,20 @@
package edu.bonn.xulu.plugin.io.grid.awt;
-import java.io.File;
+import java.io.File;
+
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
+import schmitzm.data.WritableGridRaster;
+import schmitzm.geotools.io.GeoExportUtil;
+import schmitzm.geotools.io.GeoImportUtil;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.ImportFactory;
+import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-import schmitzm.data.WritableGridRaster;
-
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.geotools.io.GeoExportUtil;
-
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
-// nur fuer Doku
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link WritableGridRaster} aus/in das GeoTiff-Format.<br>
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,17 +11,16 @@
package edu.bonn.xulu.plugin.io.grid.gt;
-import java.awt.geom.Rectangle2D;
-import org.geotools.geometry.Envelope2D;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import java.awt.geom.Rectangle2D;
+
+import org.geotools.geometry.Envelope2D;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
+import 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;
-import schmitzm.data.WritableGrid;
-import schmitzm.geotools.grid.WritableGridCoverage;
-import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-// nur fuer Doku
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-
/**
* Diese Factory erzeugt Standard-Instanzen des Datentyps {@link WritableGridCoverage}.<br>
* <b>Bemerke:</b><br>
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,24 +11,21 @@
package edu.bonn.xulu.plugin.io.grid.gt;
-import java.io.File;
+import java.io.File;
+
+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 edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.ImportFactory;
+import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-import org.geotools.coverage.grid.GridCoverage2D;
-
-import schmitzm.geotools.grid.WritableGridCoverage;
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.geotools.io.GeoExportUtil;
-
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
-// nur fuer Doku
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link WritableGridCoverage} aus/in das ArcInfo-ASCII-Grid-Format.<br>
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridCoverageFactory_GeoTiff.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,24 +11,21 @@
package edu.bonn.xulu.plugin.io.grid.gt;
-import java.io.File;
+import java.io.File;
+
+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 edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.ImportFactory;
+import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-import org.geotools.coverage.grid.GridCoverage2D;
-
-import schmitzm.geotools.grid.WritableGridCoverage;
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.geotools.io.GeoExportUtil;
-
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
-// nur fuer Doku
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link WritableGridCoverage} aus/in das GeoTiff-Format.<br>
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,12 +11,10 @@
package edu.bonn.xulu.plugin.io.grid.gt;
-import edu.bonn.xulu.io.InstantiationFactory;
+import schmitzm.data.WritableGrid;
+import edu.bonn.xulu.io.InstantiationFactory;
+import edu.bonn.xulu.plugin.data.grid.GridList;
-// nur fuer Doku
-import schmitzm.data.WritableGrid;
-import edu.bonn.xulu.plugin.data.grid.GridList;
-
/**
* Diese Factory erzeugt Standard-Instanzen von {@link GridList} mit
* durch die Factory {@link GridCoverageFactory} erzeugten (auf GeoTools
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/GridListFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -14,28 +14,21 @@
import java.io.File;
import org.geotools.coverage.grid.GridCoverage2D;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.geotools.grid.WritableGridCoverage;
-
-import schmitzm.io.IOUtil;
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 edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.GridList;
-// fuer Doku
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import skrueger.geotools.StyledLayerUtil;
-import schmitzm.data.property.ScalarProperty;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link GridList} aus/in Dateien im ArcInfo-ASCII-Grid-Format.
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/MultiGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/MultiGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/MultiGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,10 +11,9 @@
package edu.bonn.xulu.plugin.io.grid.gt;
-import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-// nur fuer Doku
-import schmitzm.data.WritableGrid;
-import edu.bonn.xulu.plugin.data.grid.MultiGrid;
+import schmitzm.data.WritableGrid;
+import edu.bonn.xulu.plugin.data.grid.MultiGrid;
+import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
/**
* Diese Factory erzeugt Standard-Instanzen von {@link MultiGrid} mit
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/MultiGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,23 +13,17 @@
import java.io.File;
-import schmitzm.geotools.io.GeoImportUtil;
-import schmitzm.geotools.grid.WritableGridCoverage;
-import schmitzm.data.WritableGrid;
+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 edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
-
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import edu.bonn.xulu.plugin.data.grid.GridList;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-import edu.bonn.xulu.plugin.io.grid.gt.GridListFactory_ArcInfoAsciiGrid;
-// nur fuer Doku
-import org.geotools.coverage.grid.GridCoverage2D;
-import edu.bonn.xulu.io.InstantiationFactory;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link MultiGrid} aus/in Dateien im ArcInfo-ASCII-Grid-Format.
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,11 +11,9 @@
package edu.bonn.xulu.plugin.io.grid.gt;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.plugin.io.grid.gt.GridCoverageFactory;
-// nur fuer Doku
-import schmitzm.data.WritableGrid;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
+import schmitzm.data.WritableGrid;
+import edu.bonn.xulu.io.InstantiationFactory;
+import edu.bonn.xulu.plugin.data.grid.SingleGrid;
/**
* Diese Factory erzeugt Standard-Instanzen von {@link SingleGrid} mit einem
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -14,25 +14,19 @@
import java.io.File;
import org.geotools.coverage.grid.GridCoverage2D;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import schmitzm.geotools.grid.WritableGridCoverage;
-import schmitzm.geotools.io.GeoImportUtil;
import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.data.property.ScalarProperty;
-
-import skrueger.geotools.StyledLayerUtil;
-
+import schmitzm.geotools.io.GeoImportUtil;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.IOUtil;
-// fuer Doku
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link SingleGrid} aus/in das ArcInfo-ASCII-Grid-Format.
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/gt/SingleGridFactory_GeoTiff.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -14,26 +14,19 @@
import java.io.File;
import org.geotools.coverage.grid.GridCoverage2D;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import schmitzm.geotools.grid.WritableGridCoverage;
-import schmitzm.geotools.io.GeoImportUtil;
import schmitzm.geotools.io.GeoExportUtil;
-import schmitzm.data.property.ScalarProperty;
-
-import skrueger.geotools.StyledLayerUtil;
-
+import schmitzm.geotools.io.GeoImportUtil;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.IOUtil;
-// fuer Doku
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link SingleGrid} aus/in das GeoTiff-Format.
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,12 +11,10 @@
package edu.bonn.xulu.plugin.io.grid.lateloading;
-import edu.bonn.xulu.io.InstantiationFactory;
+import schmitzm.data.WritableGrid;
+import edu.bonn.xulu.io.InstantiationFactory;
+import edu.bonn.xulu.plugin.data.grid.GridList;
-// nur fuer Doku
-import schmitzm.data.WritableGrid;
-import edu.bonn.xulu.plugin.data.grid.GridList;
-
/**
* Diese Factory erzeugt Standard-Instanzen von {@link GridList} mit
* durch die Factory {@link WritableGridLLFactory} erzeugten (auf Standard-Arrays
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/GridListFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,29 +13,22 @@
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 schmitzm.io.IOUtil;
-import schmitzm.data.WritableGridArray;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyReadAccess;
-
-import edu.bonn.xulu.io.Factory;
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.GridList;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_ArcInfoAsciiGrid;
-// fuer Doku
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link GridList} aus/in Dateien im ArcInfo-ASCII-Grid-Format.
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/MultiGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/MultiGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/MultiGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,10 +11,9 @@
package edu.bonn.xulu.plugin.io.grid.lateloading;
-import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-// nur fuer Doku
-import schmitzm.data.WritableGrid;
-import edu.bonn.xulu.plugin.data.grid.MultiGrid;
+import schmitzm.data.WritableGrid;
+import edu.bonn.xulu.plugin.data.grid.MultiGrid;
+import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
/**
* Diese Factory erzeugt Standard-Instanzen von {@link MultiGrid} mit
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/MultiGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,26 +13,18 @@
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 schmitzm.data.WritableGrid;
-
import edu.bonn.xulu.appl.XuluRegistry;
import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.io.ImportFactory;
-
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import edu.bonn.xulu.plugin.data.grid.GridList;
import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_ArcInfoAsciiGrid;
-//import edu.bonn.xulu.plugin.io.grid.gt.GridListFactory_ArcInfoAsciiGrid;
-// nur fuer Doku
-import schmitzm.data.WritableGridArray;
-import edu.bonn.xulu.io.InstantiationFactory;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link MultiGrid} aus/in Dateien im ArcInfo-ASCII-Grid-Format.
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,11 +11,10 @@
package edu.bonn.xulu.plugin.io.grid.lateloading;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
-// nur fuer Doku
-import schmitzm.data.WritableGrid;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
+import schmitzm.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;
/**
* Diese Factory erzeugt Standard-Instanzen von {@link SingleGrid} mit einem
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory_ArcInfoAsciiGrid.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,20 +13,16 @@
import java.io.File;
+import schmitzm.data.WritableGridArray;
import appl.data.DataProxy;
import appl.data.WritableGridLLProxy;
import appl.ext.XuluConfig;
-import appl.util.RasterMetaData;
import appl.util.RasterUtil;
-
-import schmitzm.data.WritableGridArray;
-
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.appl.XuluRegistry;
-
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.IOUtil;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_ArcInfoAsciiGrid;
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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/SingleGridFactory_GeoTiff.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,17 +13,13 @@
import java.io.File;
+import schmitzm.data.WritableGridArray;
import appl.data.DataProxy;
import appl.data.WritableGridLLProxy;
-
-import schmitzm.data.WritableGridArray;
-
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.io.AbstractFactory;
import edu.bonn.xulu.appl.XuluRegistry;
-
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
+import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.plugin.data.grid.SingleGrid;
import edu.bonn.xulu.plugin.io.IOUtil;
import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory_GeoTiff;
Modified: trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/WritableGridLLFactory.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/WritableGridLLFactory.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/grid/lateloading/WritableGridLLFactory.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,25 +11,15 @@
package edu.bonn.xulu.plugin.io.grid.lateloading;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.DataBuffer;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
+import appl.data.WritableGridLLProxy;
+import 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;
+import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-
-import appl.data.WritableGridLLProxy;
-import appl.util.RasterMetaData;
-import schmitzm.data.WritableGrid;
-import edu.bonn.xulu.plugin.io.grid.WritableGridFactory;
-import edu.bonn.xulu.plugin.io.grid.array.WritableGridArrayFactory;
-
-// nur fuer Doku
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.io.Factory;
-import edu.bonn.xulu.plugin.data.grid.SingleGrid;
-
/**
* Diese Factory erzeugt Standard-Instanzen des Datentyps {@link WritableGridLLProxy}.<br>
* <b>Bemerke:</b><br>
Modified: trunk/src/edu/bonn/xulu/plugin/io/misc/CAAreaListFactory_ShapeFile.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/misc/CAAreaListFactory_ShapeFile.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/misc/CAAreaListFactory_ShapeFile.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,25 +11,24 @@
package edu.bonn.xulu.plugin.io.misc;
-import java.io.File;
import java.awt.geom.Point2D;
+import java.io.File;
-import org.geotools.feature.Feature;
import org.geotools.feature.FeatureIterator;
-import com.vividsolutions.jts.geom.Point;
+import org.opengis.feature.simple.SimpleFeature;
-import schmitzm.geotools.io.GeoImportUtil;
-
import schmitzm.data.property.ListProperty;
import schmitzm.data.property.ListPropertyWriteAccess;
+import schmitzm.geotools.io.GeoImportUtil;
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.plugin.data.misc.CAArea;
+import com.vividsolutions.jts.geom.Point;
+
import edu.bonn.xulu.appl.XuluRegistry;
-import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.data.DynamicXuluObject;
+import edu.bonn.xulu.data.XuluObject;
+import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ImportFactory;
+import edu.bonn.xulu.plugin.data.misc.CAArea;
/**
* Diese Factory importiert Instanzen des Datentyps {@link CAArea} aus einem
@@ -97,12 +96,12 @@
ListProperty prop = new ListProperty("Areas",caAreaType);
xuluObject.addProperty( prop );
// Features einlesen
- FeatureIterator featIter = GeoImportUtil.readFeaturesFromShapeFile((File)input).features();
+ FeatureIterator<SimpleFeature> featIter = GeoImportUtil.readFeaturesFromShapeFile((File)input).features();
// CA-Areas erzeugen und der ListProperty hinzufuegen
ListPropertyWriteAccess wa = prop.getWriteAccess(this);
for (int i=1; featIter.hasNext(); i++ ) {
- Feature f = featIter.next();
+ SimpleFeature f = featIter.next();
try {
// Area der Liste hinzufuegen
wa.addValue( interpreteFeature(i,f) );
@@ -125,7 +124,7 @@
* @param featNo Nummer des Features (beginnend bei 0)
* @param f zu interpretierendes Feature
*/
- protected CAArea interpreteFeature(int featNo, Feature f) {
+ protected CAArea interpreteFeature(int featNo, SimpleFeature f) {
return interpreteFeature(featNo,f,null);
}
@@ -136,7 +135,7 @@
* @param area Area in die die Informationen hineingeschrieben werden (wenn
* {@code null}, wird eine neue {@link CAArea}-Instanz erzeugt)
*/
- protected CAArea interpreteFeature(int featNo, Feature f, CAArea area) {
+ protected CAArea interpreteFeature(int featNo, SimpleFeature f, CAArea area) {
Object attr = null;
String attrName = "";
Modified: trunk/src/edu/bonn/xulu/plugin/io/misc/CASettlementAreaListFactory_ShapeFile.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/misc/CASettlementAreaListFactory_ShapeFile.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/misc/CASettlementAreaListFactory_ShapeFile.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,27 +11,13 @@
package edu.bonn.xulu.plugin.io.misc;
-import java.io.File;
-import java.awt.geom.Point2D;
+import org.opengis.feature.simple.SimpleFeature;
+
+import 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;
-import org.geotools.feature.Feature;
-import org.geotools.feature.FeatureIterator;
-import com.vividsolutions.jts.geom.Point;
-
-import schmitzm.geotools.io.GeoImportUtil;
-
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyWriteAccess;
-
-import edu.bonn.xulu.io.ImportFactory;
-import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.AbstractFactory;
-import edu.bonn.xulu.plugin.data.misc.CASettlementArea;
-import edu.bonn.xulu.appl.XuluRegistry;
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.data.DynamicXuluObject;
-import edu.bonn.xulu.plugin.data.misc.CAArea;
-
/**
* Diese Factory importiert Instanzen des Datentyps {@link CASettlementArea} aus einem
* Shape-File. Dessen Features muessen folgende Attribute besitzen:
@@ -86,7 +72,7 @@
* @param featNo Nummer des Features (beginnend bei 0)
* @param f zu interpretierendes Feature
*/
- protected CASettlementArea interpreteFeature(int featNo, Feature f) {
+ protected CASettlementArea interpreteFeature(int featNo, SimpleFeature f) {
return interpreteFeature(featNo,f,null);
}
@@ -100,7 +86,7 @@
* @throws IllegalArgumentException wenn {@code settArea} keine Instanz von
* {@link CASettlementArea} ist
*/
- protected CASettlementArea interpreteFeature(int featNo, Feature f, CAArea settArea) {
+ protected CASettlementArea interpreteFeature(int featNo, SimpleFeature f, CAArea settArea) {
if ( settArea == null )
settArea = new CASettlementArea();
if ( !(settArea instanceof CASettlementArea) )
Modified: trunk/src/edu/bonn/xulu/plugin/io/misc/DynamicXuluObjectFactory_BasicStructure.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/io/misc/DynamicXuluObjectFactory_BasicStructure.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/io/misc/DynamicXuluObjectFactory_BasicStructure.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,33 +11,42 @@
package edu.bonn.xulu.plugin.io.misc;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.BufferedWriter;
-import java.util.Vector;
+import java.io.OutputStreamWriter;
+import java.util.Arrays;
import java.util.Collection;
import java.util.StringTokenizer;
+import java.util.Vector;
+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.data.property.*;
import schmitzm.temp.BaseTypeUtil;
-
+import edu.bonn.xulu.appl.XuluRegistry;
+import edu.bonn.xulu.data.DynamicXuluObject;
+import edu.bonn.xulu.data.XuluDataException;
+import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.io.AbstractFactory;
+import edu.bonn.xulu.io.ExportFactory;
import edu.bonn.xulu.io.ImportFactory;
import edu.bonn.xulu.io.InstantiationFactory;
-import edu.bonn.xulu.io.ExportFactory;
-import edu.bonn.xulu.data.XuluObject;
-import edu.bonn.xulu.data.DynamicXuluObject;
-import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.appl.XuluRegistry;
-import org.apache.log4j.Logger;
-import java.io.OutputStreamWriter;
-import java.util.Arrays;
-
/**
* Diese Factory importiert und exportiert Instanzen des Datentyps
* {@link DynamicXuluObject} aus einem (in ein) einfaches ASCII-Format.
Modified: trunk/src/edu/bonn/xulu/plugin/model/ca/MultiCellularAutomaton.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/ca/MultiCellularAutomaton.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/ca/MultiCellularAutomaton.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,33 +11,26 @@
package edu.bonn.xulu.plugin.model.ca;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.TreeSet;
import java.awt.Point;
+import java.util.TreeSet;
+import java.util.Vector;
-import schmitzm.lang.ComparableObject;
-
-import schmitzm.data.WritableGrid;
import schmitzm.data.AbstractWritableGrid;
-import schmitzm.data.property.ScalarProperty;
+import schmitzm.data.WritableGrid;
import schmitzm.data.property.ListProperty;
import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.ListPropertyReadAccess;
import schmitzm.data.property.PropertyWriteAccess;
-
+import schmitzm.data.property.ScalarProperty;
+import schmitzm.lang.ComparableObject;
import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.plugin.data.misc.CAArea;
-import edu.bonn.xulu.model.AbstractStepModel;
import edu.bonn.xulu.model.AbstractModelContentManager;
+import edu.bonn.xulu.model.AbstractStepModel;
+import edu.bonn.xulu.model.ModelContentManager;
import edu.bonn.xulu.model.ValuePropertyResource;
import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
+import edu.bonn.xulu.plugin.data.misc.CAArea;
-// nur fuer Doku
-import edu.bonn.xulu.model.ModelContentManager;
-
/**
* Dieses Modell stellt einen abstrakten zellularen Automaten (CA) dar,
* der auf Basis einer {@linkplain #getPreferenceValue(Point,int,CAArea,int) Bewertungsfunktion}
Modified: trunk/src/edu/bonn/xulu/plugin/model/ca/agric/ImpetusCellularAutomaton.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/ca/agric/ImpetusCellularAutomaton.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/ca/agric/ImpetusCellularAutomaton.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -12,24 +12,20 @@
package edu.bonn.xulu.plugin.model.ca.agric;
import java.awt.Point;
-import java.awt.geom.Point2D;
import java.util.Vector;
-import schmitzm.data.WritableGrid;
import schmitzm.data.AbstractWritableGrid;
-
+import schmitzm.data.WritableGrid;
+import schmitzm.data.property.ListProperty;
+import schmitzm.data.property.PropertyReadAccess;
+import schmitzm.data.property.ScalarProperty;
+import edu.bonn.xulu.data.XuluDataException;
+import edu.bonn.xulu.model.ModelContentManager;
+import edu.bonn.xulu.model.ValuePropertyResource;
import edu.bonn.xulu.plugin.data.misc.CAArea;
import edu.bonn.xulu.plugin.data.misc.CASettlementArea;
import edu.bonn.xulu.plugin.model.ca.MultiCellularAutomaton;
-import edu.bonn.xulu.model.ValuePropertyResource;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ListProperty;
-import edu.bonn.xulu.data.XuluDataException;
-import schmitzm.data.property.PropertyReadAccess;
-// nur fuer Doku
-import edu.bonn.xulu.model.ModelContentManager;
-
/**
* Dieser zellulare Automat modelliert die Ausbreitung von Feldflaechen (Ackerland)
* im Impetus-Untersuchungsgebiet.
Modified: trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCA.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCA.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCA.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,63 +11,60 @@
package edu.bonn.xulu.plugin.model.ca.fire;
-import java.util.Map;
-import java.util.Vector;
-import java.util.HashMap;
-import java.util.Random;
-import java.util.GregorianCalendar;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.awt.Component;
-
import java.awt.Color;
-import java.awt.Graphics;
+import java.awt.Component;
import java.awt.Dimension;
-import java.awt.GridBagLayout;
-import java.awt.BorderLayout;
+import java.awt.Graphics;
import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
import java.awt.Insets;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Random;
+import java.util.Vector;
+
import javax.swing.JLabel;
import javax.swing.JSlider;
import javax.swing.JTable;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
+import org.apache.log4j.Logger;
import org.geotools.feature.FeatureCollection;
import org.geotools.feature.FeatureIterator;
-import org.geotools.feature.Feature;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.MultiPoint;
-
-import edu.bonn.xulu.data.DynamicXuluObject;
-import edu.bonn.xulu.model.AbstractStepModel;
-import edu.bonn.xulu.plugin.data.feature.SingleFeatureCollection;
-
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.ListPropertyReadAccess;
import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.MatrixProperty;
import schmitzm.lang.LangUtil;
+import schmitzm.lang.ResourceProvider;
import schmitzm.swing.CaptionsChangeable;
-import schmitzm.swing.JPanel;
import schmitzm.swing.InputCompass;
+import schmitzm.swing.JPanel;
import schmitzm.swing.SliderSpinnerPanel;
-import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
-import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
+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 org.apache.log4j.Logger;
-import schmitzm.lang.ResourceProvider;
import edu.bonn.xulu.XuluModellingPlatform;
-import java.util.Locale;
+import edu.bonn.xulu.data.DynamicXuluObject;
+import edu.bonn.xulu.model.AbstractStepModel;
+import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
+import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
+import edu.bonn.xulu.plugin.data.feature.SingleFeatureCollection;
/**
* Diese Klasse stellt eine Implementierung des Modells {@linkplain ImpetusFireCA}
@@ -528,7 +525,7 @@
* Punkte einer {@link FeatureCollection}.
* @param burnSource FeatureCollection von {@link Point} und {@link MultiPoint}
*/
- protected void initBurningCells(FeatureCollection burnSource) {
+ protected void initBurningCells(FeatureCollection<SimpleFeatureType,SimpleFeature> burnSource) {
// brennende Zellen
if ( burningCells == null )
burningCells = new Vector<int[]>();
@@ -541,9 +538,9 @@
else
uselessBurningCells.clear();
- FeatureIterator fi = burnSource.features();
+ FeatureIterator<SimpleFeature> fi = burnSource.features();
for (; fi.hasNext();) {
- Geometry g = fi.next().getDefaultGeometry();
+ Geometry g = (Geometry)fi.next().getDefaultGeometry();
if ( g == null )
continue;
if ( g instanceof Point ) {
@@ -562,6 +559,7 @@
} );
}
}
+ fi.close();
for ( int[] p : burningCells )
LOGGER.debug("initial burning cell: "+p[0]+" / "+p[1]);
@@ -594,7 +592,7 @@
////////////////////////////////////////////////////////////////////////
/**
* Berechnet die Windmatrix fuer gegebene Windrichtung und -staerke.
- * @param direction Windrichtung in Grad (Nord = 0°, West = 90°)
+ * @param direction Windrichtung in Grad (Nord = 0�, West = 90�)
* @param power Windstaerke in m/s
* @param directionDev Max. Abweichung der Windrichtung in Grad
* @param powerDev Max. Abweichung der Windstaerke in m/s
Modified: trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCAContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCAContentManager.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/ca/fire/ImpetusFireCAContentManager.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,6 +13,20 @@
import java.util.Map;
+import org.geotools.feature.FeatureCollection;
+import org.geotools.feature.FeatureIterator;
+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 edu.bonn.xulu.data.DynamicXuluObject;
import edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.AbstractModelContentManager;
@@ -21,20 +35,7 @@
import edu.bonn.xulu.model.ValuePropertyResource;
import edu.bonn.xulu.plugin.data.feature.SingleFeatureCollection;
-import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.FeatureIterator;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.MultiPoint;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.AbstractWritableGrid;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.lang.ResourceProvider;
-
-
/**
* Diese Klasse definiert und verwaltet die 7
* Ressourcen fuer das Modell {@linkplain ImpetusFireCA}
@@ -158,11 +159,11 @@
throwResourceException(0, ImpetusFireCA.RESOURCE.getString("Error.In.ModelParams.WindMatrix_PowerFact",ImpetusFireCA.PARAM_PROP_WINDMATRIX_PCONST));
// Pruefen, ob FeatureCollection "Punkte" enthaelt
- FeatureCollection fc = ((SingleFeatureCollection)getResource(1).getData()).getFeatureCollection();
- FeatureIterator fi = fc.features();
+ FeatureCollection<SimpleFeatureType,SimpleFeature> fc = ((SingleFeatureCollection)getResource(1).getData()).getFeatureCollection();
+ FeatureIterator<SimpleFeature> fi = fc.features();
Geometry g = null;
if ( !fi.hasNext() ||
- (g = fi.next().getDefaultGeometry()) == null ||
+ (g = (Geometry)fi.next().getDefaultGeometry()) == null ||
!( g instanceof Point || g instanceof MultiPoint ) )
throwResourceException(1,ImpetusFireCA.RESOURCE.getString("Error.In.BurnSource.Data"));
Modified: trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,56 +11,64 @@
package edu.bonn.xulu.plugin.model.ca.reservoir;
+import static edu.bonn.xulu.plugin.model.ca.reservoir.SmallReservoirModelContentManager.DAM_HEIGHT_NO;
+import static edu.bonn.xulu.plugin.model.ca.reservoir.SmallReservoirModelContentManager.DAM_LOC_NO;
+import static edu.bonn.xulu.plugin.model.ca.reservoir.SmallReservoirModelContentManager.DHM_NO;
+import static edu.bonn.xulu.plugin.model.ca.reservoir.SmallReservoirModelContentManager.EVAPO_NO;
+import static edu.bonn.xulu.plugin.model.ca.reservoir.SmallReservoirModelContentManager.INFILT_NO;
+import static edu.bonn.xulu.plugin.model.ca.reservoir.SmallReservoirModelContentManager.OUT_AREA_NO;
+import static edu.bonn.xulu.plugin.model.ca.reservoir.SmallReservoirModelContentManager.OUT_AREA_SIZE_NO;
+import static edu.bonn.xulu.plugin.model.ca.reservoir.SmallReservoirModelContentManager.OUT_AREA_VOL_NO;
+import static edu.bonn.xulu.plugin.model.ca.reservoir.SmallReservoirModelContentManager.STEP_SIZE_NO;
+import static edu.bonn.xulu.plugin.model.ca.reservoir.SmallReservoirModelContentManager.TMP_DHM_NO;
+
+import java.awt.Component;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.Point;
+import java.text.DecimalFormat;
+import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
-import java.util.Random;
-import java.util.GregorianCalendar;
import java.util.Set;
-import java.util.HashSet;
import java.util.Vector;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.text.DecimalFormat;
-import java.awt.Component;
-import java.awt.Point;
-import java.awt.GridBagLayout;
-import java.awt.GridBagConstraints;
-import java.awt.Insets;
+
+import javax.swing.JCheckBox;
import javax.swing.JLabel;
-import javax.swing.JCheckBox;
+import org.apache.log4j.Logger;
+import org.geotools.coverage.grid.GridCoverage2D;
import org.geotools.feature.FeatureCollection;
-import org.geotools.coverage.grid.GridCoverage2D;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
-
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 schmitzm.geotools.grid.GridUtil;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.ListPropertyWriteAccess;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.MultiLineString;
+
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.model.XuluModel;
import edu.bonn.xulu.model.AbstractStepModel;
+import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
-import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
+import edu.bonn.xulu.plugin.data.feature.SingleFeatureCollection;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import edu.bonn.xulu.plugin.data.feature.SingleFeatureCollection;
import edu.bonn.xulu.plugin.model.ca.fire.ImpetusFireCA;
-import static edu.bonn.xulu.plugin.model.ca.reservoir.SmallReservoirModelContentManager.*;
+import edu.bonn.xulu.plugin.model.ca.fire.ImpetusFireCAContentManager;
-import org.apache.log4j.Logger;
-
/**
* Diese Klasse stellt eine Implementierung des Modells {@linkplain ImpetusFireCA}
* dar. Dieses benoetigt 7 Ressourcen, welche durch den
@@ -138,7 +146,7 @@
//**************** Variablen mit denen gearbeitet wird *******************
protected WritableGrid dhm = null; // Hoehenmodell
- protected FeatureCollection damWall = null; // Lage der Staumauer
+ protected FeatureCollection<SimpleFeatureType,SimpleFeature> damWall = null; // Lage der Staumauer
protected double[] damWallHeight = null; // Hoehe der Staumauer ueber NN
protected double[] damWallHeightMin = null; // min. Hoehe der Staumauer ueber NN
protected double[] damWallHeightMax = null; // max. Hoehe der Staumauer ueber NN
@@ -474,7 +482,7 @@
*/
protected void determineDamWallCells() {
// Erstes Feature aus der Collection holen
- Geometry g = damWall.features().next().getDefaultGeometry();
+ Geometry g = (Geometry)damWall.features().next().getDefaultGeometry();
// LineString(s) in Vector einfuegen
Vector<LineString> lineStrings = new Vector<LineString>();
if ( g instanceof LineString )
Modified: trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModelContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModelContentManager.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/ca/reservoir/SmallReservoirModelContentManager.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -13,29 +13,30 @@
import java.util.Map;
+import org.geotools.feature.FeatureCollection;
+import org.geotools.feature.FeatureIterator;
+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 edu.bonn.xulu.data.XuluDataException;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.AbstractXuluModel;
+import edu.bonn.xulu.model.DefaultModelResource;
import edu.bonn.xulu.model.ModelResource;
import edu.bonn.xulu.model.PropertiesResource;
import edu.bonn.xulu.model.ValuePropertyResource;
import edu.bonn.xulu.plugin.data.feature.SingleFeatureCollection;
-
-import org.geotools.feature.FeatureCollection;
-import org.geotools.feature.FeatureIterator;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiLineString;
-
-import schmitzm.data.WritableGrid;
-import schmitzm.data.AbstractWritableGrid;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.lang.ResourceProvider;
-import edu.bonn.xulu.model.DefaultModelResource;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import edu.bonn.xulu.plugin.model.ca.fire.ImpetusFireCA;
/**
@@ -138,10 +139,10 @@
// Pruefen, ob FeatureCollection "eine Linie" enthaelt
SingleFeatureCollection sfc = (SingleFeatureCollection)getResource(1).getData();
if ( sfc != null && sfc.getFeatureCollection().size() > 0 ) {
- FeatureCollection fc = sfc.getFeatureCollection();
- FeatureIterator fi = fc.features();
+ FeatureCollection<SimpleFeatureType,SimpleFeature> fc = sfc.getFeatureCollection();
+ FeatureIterator<SimpleFeature> fi = fc.features();
Geometry g = null;
- if ( (g = fi.next().getDefaultGeometry()) == null ||
+ if ( (g = (Geometry)fi.next().getDefaultGeometry()) == null ||
!( g instanceof LineString || g instanceof MultiLineString ) )
throwResourceException(2, SmallReservoirModel.RESOURCE.getString("Error.In.Dam.Loc"));
} else
Modified: trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -19,11 +19,10 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Locale;
import java.util.Map;
import java.util.Random;
import java.util.Set;
-import java.util.Locale;
-import java.lang.reflect.Array;
import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
@@ -54,7 +53,6 @@
import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import edu.bonn.xulu.plugin.model.ca.fire.ImpetusFireCA;
/**
* Diese Klasse stellt eine Nachbildung des
Modified: trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModelContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModelContentManager.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModelContentManager.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,30 +11,21 @@
package edu.bonn.xulu.plugin.model.clue;
+import java.util.Map;
+
import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ScalarProperty;
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 schmitzm.lang.ResourceProvider;
-
-import edu.bonn.xulu.model.ModelResource;
+import edu.bonn.xulu.data.XuluDataException;
+import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.AbstractModelResource;
+import edu.bonn.xulu.model.ModelResource;
import edu.bonn.xulu.model.ValuePropertyResource;
-import edu.bonn.xulu.model.AbstractModelContentManager;
-import edu.bonn.xulu.data.XuluDataException;
-
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import edu.bonn.xulu.plugin.model.ca.fire.ImpetusFireCA;
-import java.util.Locale;
-import java.util.Map;
-
-import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.XuluModellingPlatform;
-
/**
* Diese Klasse verwaltet die Ressourcen fuer das {@linkplain ClueModel Clue-Modell}
* und prueft diese auf Korrektheit.<br>
Modified: trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Optimized.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Optimized.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Optimized.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,40 +11,21 @@
package edu.bonn.xulu.plugin.model.clue;
-import java.util.Random;
+import java.util.Random;
+
+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 edu.bonn.xulu.model.AbstractStepModel;
+import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
+import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
+import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import org.apache.log4j.Logger;
-import org.apache.log4j.LogManager;
-
-import schmitzm.lang.LangUtil;
-
-import schmitzm.data.property.Access;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.data.property.ValuePropertyType;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.WritableGrid;
-
-import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.model.AbstractStepModel;
-import edu.bonn.xulu.model.ModelContentManager;
-import edu.bonn.xulu.model.AbstractModelContentManager;
-import edu.bonn.xulu.model.ModelResource;
-import edu.bonn.xulu.model.AbstractModelResource;
-import edu.bonn.xulu.model.ValuePropertyResource;
-import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
-import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
-
-import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-
-import schmitzm.temp.BaseTypeUtil;
-
/**
* Diese Klasse stellt den Versuch einer Laufzeit-verbesserten Implementierung der
* ersten <a href="http://www.dow.wau.nl/clue/" target="_blank">CLUE</a>-Modell-Implementierung
Modified: trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Original.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Original.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/clue/ClueModel_Original.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,61 +11,37 @@
package edu.bonn.xulu.plugin.model.clue;
-import java.awt.image.DataBuffer;
-import java.awt.Window;
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.geom.AffineTransform;
-import javax.swing.BoxLayout;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JProgressBar;
-import javax.swing.BoundedRangeModel;
-import javax.swing.DefaultBoundedRangeModel;
-import javax.swing.JSlider;
-import javax.swing.SpringLayout;
-import javax.swing.BorderFactory;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
-import java.util.Random;
-import java.text.NumberFormat;
-import java.text.DecimalFormat;
+import java.awt.Component;
+import java.awt.Font;
+import java.awt.geom.AffineTransform;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.Random;
+
+import javax.swing.BorderFactory;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JSlider;
+import javax.swing.SpringLayout;
+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 edu.bonn.xulu.model.AbstractStepModel;
+import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
+import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
+import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-import schmitzm.lang.LangUtil;
-
-import schmitzm.data.property.Access;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.data.property.ValuePropertyType;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.ListProperty;
-import schmitzm.data.property.MatrixProperty;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.PropertyWriteAccess;
-import schmitzm.data.WritableGrid;
-
-import schmitzm.swing.SwingUtil;
-import schmitzm.swing.SpringUtilities;
-import schmitzm.swing.ExpansionBar;
-
-import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.model.AbstractStepModel;
-import edu.bonn.xulu.model.ModelContentManager;
-import edu.bonn.xulu.model.AbstractModelContentManager;
-import edu.bonn.xulu.model.ModelResource;
-import edu.bonn.xulu.model.AbstractModelResource;
-import edu.bonn.xulu.model.ValuePropertyResource;
-import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
-import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
-
-import edu.bonn.xulu.plugin.data.grid.MultiGrid;
-
-import schmitzm.temp.BaseTypeUtil;
-
/**
* <b>BEI DIESER KLASSE HANDELT ES SICH UM DIE URSPRUENGLICHE XULU-IMPLEMENTIERUG
* DES CLUE-MODELLS. DARIN KOMMEN NOCH KEINERLEI LAUFZEIT-OPTIMIERENDE TECHNIKEN
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelContentManager.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelContentManager.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,19 +1,16 @@
package edu.bonn.xulu.plugin.model.parallel;
import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ScalarProperty;
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 edu.bonn.xulu.model.ModelResource;
+import edu.bonn.xulu.data.XuluDataException;
+import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.AbstractModelResource;
+import edu.bonn.xulu.model.ModelResource;
import edu.bonn.xulu.model.ValuePropertyResource;
-import edu.bonn.xulu.model.AbstractModelContentManager;
-import edu.bonn.xulu.data.XuluDataException;
-
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelParallel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelParallel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueModelParallel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,75 +1,44 @@
package edu.bonn.xulu.plugin.model.parallel;
-import java.awt.image.DataBuffer;
-import java.awt.Window;
import java.awt.Component;
-import java.awt.Container;
-import java.awt.Color;
import java.awt.Font;
import java.awt.geom.AffineTransform;
-import java.io.File;
-
-import javax.swing.BoxLayout;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JCheckBox;
-import javax.swing.JProgressBar;
-import javax.swing.BoundedRangeModel;
-import javax.swing.DefaultBoundedRangeModel;
-import javax.swing.JSlider;
-import javax.swing.SpringLayout;
-import javax.swing.BorderFactory;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
-
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Random;
import java.util.Set;
-import java.text.NumberFormat;
-import java.text.DecimalFormat;
-import org.apache.log4j.Logger;
+import javax.swing.BorderFactory;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JSlider;
+import javax.swing.SpringLayout;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
-import appl.parallel.data.splittable.SplittableGridLLFactory;
-import appl.parallel.model.AbstractParallelStepModel;
-import appl.parallel.spmd.MultiDataObject;
-import appl.parallel.spmd.SPMDClientInterface;
-import appl.util.GeneralUtil;
-import appl.util.RasterUtil;
-
-import schmitzm.lang.LangUtil;
-
-import schmitzm.data.property.Access;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.data.property.ValuePropertyType;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
+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.data.WritableGrid;
-
-import schmitzm.swing.SwingUtil;
-import schmitzm.swing.SpringUtilities;
+import schmitzm.lang.LangUtil;
import schmitzm.swing.ExpansionBar;
-
-import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.model.AbstractStepModel;
-import edu.bonn.xulu.model.ModelContentManager;
-import edu.bonn.xulu.model.AbstractModelContentManager;
-import edu.bonn.xulu.model.ModelResource;
-import edu.bonn.xulu.model.AbstractModelResource;
-import edu.bonn.xulu.model.ValuePropertyResource;
-import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
+import schmitzm.swing.SpringUtilities;
+import schmitzm.swing.SwingUtil;
+import appl.parallel.model.AbstractParallelStepModel;
+import appl.parallel.spmd.MultiDataObject;
+import appl.parallel.spmd.SPMDClientInterface;
import edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
-
+import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
import edu.bonn.xulu.plugin.model.clue.ClueModel;
import edu.bonn.xulu.plugin.model.clue.ClueModelContentManager;
@@ -77,8 +46,6 @@
import edu.bonn.xulu.plugin.model.parallel.demo.AverageNeighborhoodParallelDemoModel;
import edu.bonn.xulu.plugin.model.parallel.demo.AverageNeighborhoodSerialDemoModel;
-import schmitzm.temp.BaseTypeUtil;
-
/**
* This class is a parallel version of the {@link ClueModel}. For details on
* the {@link ClueModel}, see its documentation. To understand the parallel
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueParallelTuned.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueParallelTuned.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueParallelTuned.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,84 +1,50 @@
package edu.bonn.xulu.plugin.model.parallel;
-import java.awt.image.DataBuffer;
-import java.awt.Window;
import java.awt.Component;
-import java.awt.Container;
-import java.awt.Color;
import java.awt.Font;
import java.awt.geom.AffineTransform;
-import java.io.File;
-
-import javax.swing.BoxLayout;
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JCheckBox;
-import javax.swing.JProgressBar;
-import javax.swing.BoundedRangeModel;
-import javax.swing.DefaultBoundedRangeModel;
-import javax.swing.JSlider;
-import javax.swing.SpringLayout;
-import javax.swing.BorderFactory;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
-
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Random;
import java.util.Set;
-import java.text.NumberFormat;
-import java.text.DecimalFormat;
-import org.apache.log4j.Logger;
+import javax.swing.BorderFactory;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JSlider;
+import javax.swing.SpringLayout;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
-import appl.parallel.data.splittable.SplittableGridLLFactory;
-import appl.parallel.model.AbstractParallelStepModel;
-import appl.parallel.spmd.AdvancedSPMDClientInterface;
-import appl.parallel.spmd.MultiDataObject;
-import appl.parallel.spmd.SPMDClientInterface;
-import appl.parallel.spmd.SyncPoint;
-import appl.parallel.spmd.SyncPoint.Priority;
-import appl.util.GeneralUtil;
-import appl.util.RasterUtil;
-
-import schmitzm.lang.LangUtil;
-
-import schmitzm.data.property.Access;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.data.property.ValuePropertyType;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.property.ListPropertyReadAccess;
-import schmitzm.data.property.ListPropertyWriteAccess;
-import schmitzm.data.property.ScalarProperty;
+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.data.WritableGrid;
-
-import schmitzm.swing.SwingUtil;
-import schmitzm.swing.SpringUtilities;
+import schmitzm.lang.LangUtil;
import schmitzm.swing.ExpansionBar;
-
-import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.model.AbstractStepModel;
-import edu.bonn.xulu.model.ModelContentManager;
-import edu.bonn.xulu.model.AbstractModelContentManager;
-import edu.bonn.xulu.model.ModelResource;
-import edu.bonn.xulu.model.AbstractModelResource;
-import edu.bonn.xulu.model.ValuePropertyResource;
-import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
+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 edu.bonn.xulu.model.event.ModelIterationStepFinishedEvent;
-
+import edu.bonn.xulu.model.event.ModelIterationStepStartedEvent;
import edu.bonn.xulu.plugin.data.grid.MultiGrid;
import edu.bonn.xulu.plugin.model.clue.ClueModelContentManager;
import edu.bonn.xulu.plugin.model.parallel.ClueTaskDefinition.Task;
-import schmitzm.temp.BaseTypeUtil;
-
/**
* Used for a better resource utilization in the associated task ({@link ClueTaskTuned}).
* Multithreading and preloading are used. See {@link ClueTaskTuned} for details.
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTask.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTask.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTask.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -3,13 +3,12 @@
import java.util.HashMap;
import java.util.Map;
-import edu.bonn.xulu.plugin.model.clue.ClueModel;
-import edu.bonn.xulu.plugin.model.parallel.ClueTaskDefinition.Task;
-
import schmitzm.data.WritableGrid;
import appl.parallel.spmd.AbstractSPMDTask;
import appl.parallel.spmd.MultiDataObject;
import appl.parallel.spmd.SPMDServerInterface;
+import edu.bonn.xulu.plugin.model.clue.ClueModel;
+import edu.bonn.xulu.plugin.model.parallel.ClueTaskDefinition.Task;
/**
* This is the task class for the parallel computation of the {@link ClueModel},
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTaskTuned.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTaskTuned.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/ClueTaskTuned.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -3,15 +3,13 @@
import java.util.HashMap;
import java.util.Map;
-import edu.bonn.xulu.plugin.model.parallel.ClueTaskDefinition.Task;
-
import schmitzm.data.WritableGrid;
import appl.parallel.spmd.AbstractSPMDTask;
import appl.parallel.spmd.AdvancedSPMDServerInterface;
import appl.parallel.spmd.MultiDataObject;
-import appl.parallel.spmd.SPMDServerInterface;
import appl.parallel.spmd.SyncPoint;
import appl.parallel.spmd.SyncPoint.Priority;
+import edu.bonn.xulu.plugin.model.parallel.ClueTaskDefinition.Task;
/**
* This is a tuned version of the {@link ClueTask}. Preloading and multithreading are
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTask.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTask.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTask.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -5,9 +5,7 @@
import schmitzm.data.WritableGrid;
import appl.parallel.spmd.AbstractSPMDTask;
import appl.parallel.spmd.AdvancedSPMDServerInterface;
-import appl.parallel.spmd.SPMDServerInterface;
import appl.parallel.spmd.SPMDTask;
-import appl.parallel.spmd.SyncPoint;
import appl.util.RasterUtil;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTuned.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTuned.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTuned.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,17 +1,13 @@
package edu.bonn.xulu.plugin.model.parallel.demo;
-import java.awt.Rectangle;
-
-import appl.parallel.model.AbstractParallelStepModel;
-import appl.parallel.spmd.AdvancedSPMDClientInterface;
-import appl.parallel.spmd.SPMDClientInterface;
-import appl.parallel.spmd.SyncPoint;
-import appl.util.RasterUtil;
-import edu.bonn.xulu.model.AbstractStepModel;
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;
/**
*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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AVNTunedTask.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -5,7 +5,6 @@
import schmitzm.data.WritableGrid;
import appl.parallel.spmd.AbstractSPMDTask;
import appl.parallel.spmd.AdvancedSPMDServerInterface;
-import appl.parallel.spmd.SPMDServerInterface;
import appl.parallel.spmd.SPMDTask;
import appl.parallel.spmd.SyncPoint;
import appl.util.RasterUtil;
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodContentManager.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodContentManager.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodContentManager.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,12 +1,11 @@
package edu.bonn.xulu.plugin.model.parallel.demo;
+import schmitzm.data.WritableGrid;
+import schmitzm.data.property.ScalarProperty;
import edu.bonn.xulu.model.AbstractModelContentManager;
import edu.bonn.xulu.model.ModelResource;
-import edu.bonn.xulu.model.PropertiesResource;
import edu.bonn.xulu.model.ValuePropertyResource;
import edu.bonn.xulu.plugin.model.clue.ClueModelContentManager;
-import schmitzm.data.WritableGrid;
-import schmitzm.data.property.ScalarProperty;
/**
Modified: trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodParallelDemoModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodParallelDemoModel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodParallelDemoModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -1,15 +1,12 @@
package edu.bonn.xulu.plugin.model.parallel.demo;
-import java.awt.Rectangle;
-
-import appl.parallel.model.AbstractParallelStepModel;
-import appl.parallel.spmd.SPMDClientInterface;
-import appl.util.RasterUtil;
-import edu.bonn.xulu.model.AbstractStepModel;
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;
/**
* 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 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/parallel/demo/AverageNeighborhoodSerialDemoModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -2,13 +2,13 @@
import java.awt.Rectangle;
-import appl.util.RasterUtil;
-import edu.bonn.xulu.model.AbstractStepModel;
-import edu.bonn.xulu.model.XuluModel;
import schmitzm.data.WritableGrid;
import schmitzm.data.property.PropertyReadAccess;
import schmitzm.data.property.PropertyWriteAccess;
import schmitzm.data.property.ScalarProperty;
+import appl.util.RasterUtil;
+import edu.bonn.xulu.model.AbstractStepModel;
+import edu.bonn.xulu.model.XuluModel;
/**
* This very simple model looks at every grid cell and takes the average
Modified: trunk/src/edu/bonn/xulu/plugin/model/test/TestModel.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/model/test/TestModel.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/model/test/TestModel.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,19 +11,17 @@
package edu.bonn.xulu.plugin.model.test;
-import java.awt.image.DataBuffer;
+import java.awt.image.DataBuffer;
+
+import schmitzm.data.WritableGrid;
+import schmitzm.data.property.PropertyReadAccess;
+import schmitzm.data.property.ScalarProperty;
+import schmitzm.temp.BaseTypeUtil;
+import edu.bonn.xulu.data.XuluDataException;
+import edu.bonn.xulu.model.AbstractModelContentManager;
+import edu.bonn.xulu.model.AbstractStepModel;
+import edu.bonn.xulu.model.PropertiesResource;
-import schmitzm.data.property.ScalarProperty;
-import schmitzm.data.property.PropertyReadAccess;
-import schmitzm.data.WritableGrid;
-import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.model.AbstractStepModel;
-import edu.bonn.xulu.model.ModelContentManager;
-import edu.bonn.xulu.model.AbstractModelContentManager;
-import edu.bonn.xulu.model.PropertiesResource;
-
-import schmitzm.temp.BaseTypeUtil;
-
/**
* Diese Klasse stellt ein Test-Modell dar, dass eigentlich gar nichts macht.
* Es benoetigt 3 Ressourcen:
Modified: trunk/src/edu/bonn/xulu/plugin/vis/GTEditorTool.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/vis/GTEditorTool.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/vis/GTEditorTool.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,26 +11,21 @@
package edu.bonn.xulu.plugin.vis;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-
import org.geotools.feature.FeatureCollection;
import org.geotools.map.MapLayer;
import org.geotools.styling.Style;
import schmitzm.data.property.ValueProperty;
import schmitzm.geotools.gui.GeoMapPane;
-import schmitzm.geotools.gui.JEditorPane;
+import schmitzm.geotools.gui.JMapEditorPane;
import schmitzm.geotools.gui.LayeredEditorFrame;
import schmitzm.geotools.gui.LayeredMapPane;
-import schmitzm.geotools.map.event.JMapPaneEvent;
import schmitzm.geotools.map.event.JMapPaneListener;
import schmitzm.geotools.map.event.LayerEditFinishedEvent;
+import schmitzm.geotools.map.event.MapPaneEvent;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.DataPool;
import edu.bonn.xulu.appl.XuluConstants;
-import edu.bonn.xulu.data.XuluDataException;
-import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.gui.XuluGUIMessages;
import edu.bonn.xulu.io.InstantiationFactory;
import edu.bonn.xulu.plugin.data.feature.SingleFeatureCollection;
@@ -54,10 +49,9 @@
super( new LayeredEditorFrame(
new LayeredMapPane(
new GeoMapPane(
- new JEditorPane(),
+ new JMapEditorPane(),
null,
null,
- null,
null
)
)
@@ -65,7 +59,7 @@
XuluConstants.XULU_VIS_RES.getString("GTEditorTool.FrameTitle")
);
// set listener to recognize new layers
- ((JEditorPane)this.layeredMapPane.getMapPane()).addMapPaneListener(this);
+ ((JMapEditorPane)this.layeredMapPane.getMapPane()).addMapPaneListener(this);
}
/**
@@ -79,20 +73,20 @@
}
/**
- * Lauscht auf das {@link JEditorPane}, um nach Beendigung eines Layers,
+ * Lauscht auf das {@link JMapEditorPane}, um nach Beendigung eines Layers,
* dieses in den Xulu-Datenpool einzufuegen.
*/
- public void performMapPaneEvent(JMapPaneEvent e) {
+ public void performMapPaneEvent(MapPaneEvent e) {
try {
if ( e instanceof LayerEditFinishedEvent ) {
LayerEditFinishedEvent lefe = (LayerEditFinishedEvent)e;
- JEditorPane editor = (JEditorPane)lefe.getSource();
- JEditorPane.EditorMode mode = editor.getEditorMode();
+ JMapEditorPane editor = (JMapEditorPane)lefe.getSource();
+ JMapEditorPane.EditorMode mode = editor.getEditorMode();
// neues Objekt im Xulu-Datenpool nur, wenn komplett neues Layer
// erstellt wurde
- if ( JEditorPane.EditorMode.New_Point.equals(mode) ||
- JEditorPane.EditorMode.New_Line.equals(mode) ||
- JEditorPane.EditorMode.New_Polygon.equals(mode) )
+ if ( JMapEditorPane.EditorMode.New_Point.equals(mode) ||
+ JMapEditorPane.EditorMode.New_Line.equals(mode) ||
+ JMapEditorPane.EditorMode.New_Polygon.equals(mode) )
createNewXuluObjectInDatapool(editor);
}
} catch (Exception err) {
@@ -106,7 +100,7 @@
* @param name Bezeichnung fuer das neue Objekt im Datenpool
* @param fc neue {@link FeatureCollection}
*/
- protected void createNewXuluObjectInDatapool(JEditorPane editor) throws Exception {
+ protected void createNewXuluObjectInDatapool(JMapEditorPane editor) throws Exception {
FeatureCollection fc = editor.getEditorFeatureCollection();
MapLayer layer = editor.getEditorLayer();
String title = layer.getTitle();
@@ -129,7 +123,7 @@
// -> Editor-Layer entfernen
// -> neues Layer als Xulu-Objekt neu in GTEditorTool
// einfuegen
- editor.getContext().removeLayer( layer );
+ editor.getMapContext().removeLayer( layer );
this.add(sfc, sfc.getDescription());
}
Modified: trunk/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/vis/GTVisualisationTool.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,61 +11,41 @@
package edu.bonn.xulu.plugin.vis;
-import java.util.Vector;
-import java.awt.Color;
-import java.awt.Point;
-import java.awt.image.Raster;
import java.awt.image.WritableRaster;
-import java.awt.image.DataBufferFloat;
-import java.awt.image.ComponentSampleModel;
-import javax.media.jai.RasterFactory;
+import java.util.Vector;
-import schmitzm.lang.LangUtil;
+import org.geotools.coverage.grid.GridCoverage2D;
+import org.geotools.feature.FeatureCollection;
+import org.geotools.map.MapContext;
+import org.geotools.map.MapLayer;
+import org.geotools.styling.Style;
+
import schmitzm.data.WritableGrid;
import schmitzm.data.WritableGridArray;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.Properties;
-import schmitzm.data.property.DynamicProperties;
-import schmitzm.data.property.ValueProperty;
-import schmitzm.data.property.ScalarProperty;
+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.event.ObjectTraceable;
-import schmitzm.data.event.ObjectListener;
-import schmitzm.data.event.ObjectEvent;
-import schmitzm.data.event.ObjectChangeEvent;
-import schmitzm.data.event.NameChangeEvent;
-import schmitzm.geotools.GTUtil;
+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 schmitzm.geotools.grid.WritableGridCoverage;
-import schmitzm.geotools.grid.GridUtil;
-
+import skrueger.geotools.StyledLayerStyle;
+import appl.data.DataProxy;
+import appl.data.LateLoadingProxy;
+import appl.data.LoadingException;
import edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.VisualisationTool;
import edu.bonn.xulu.appl.VisualisationUpdateListener;
-import edu.bonn.xulu.data.XuluObject;
import edu.bonn.xulu.appl.XuluConstants;
+import edu.bonn.xulu.data.XuluObject;
-import org.geotools.map.MapContext;
-import org.geotools.map.MapLayer;
-import org.geotools.coverage.grid.GridCoverageFactory;
-import org.geotools.coverage.grid.GridCoverage2D;
-import org.geotools.feature.FeatureCollection;
-import org.geotools.geometry.Envelope2D;
-import org.geotools.geometry.GeneralEnvelope;
-import org.geotools.coverage.GridSampleDimension;
-import org.geotools.coverage.Category;
-import org.geotools.styling.Style;
-
-import appl.data.DataProxy;
-import appl.data.LateLoadingProxy;
-import appl.data.LoadingException;
-
-// nur fuer Doku
-import schmitzm.data.WritableGridRaster;
-import skrueger.geotools.StyledLayerStyle;
-
/**
* Diese Klasse stellt ein Visualisierungstool fuer geografische Raster- und
* Vektor-Daten dar. Es basiert auf {@link LayeredMapFrame} und kann Layer fuer
@@ -408,7 +388,7 @@
public UpdateListener(GTVisualisationTool tool, Object obj, MapLayer[] layer) {
super(tool,obj);
this.layer = layer;
- this.mapContext = tool.layeredMapPane.getMapPane().getContext();
+ this.mapContext = tool.layeredMapPane.getMapPane().getMapContext();
}
/**
Modified: trunk/src/edu/bonn/xulu/plugin/vis/JFreeChartVisualisationTool.java
===================================================================
--- trunk/src/edu/bonn/xulu/plugin/vis/JFreeChartVisualisationTool.java 2010-02-10 16:14:27 UTC (rev 77)
+++ trunk/src/edu/bonn/xulu/plugin/vis/JFreeChartVisualisationTool.java 2010-02-10 16:43:46 UTC (rev 78)
@@ -11,57 +11,58 @@
package edu.bonn.xulu.plugin.vis;
-import java.awt.Dimension;
+import static edu.bonn.xulu.appl.XuluConstants.XULU_VIS_RES;
+import static schmitzm.jfree.JFreeChartUtil.RESOURCE;
+
import java.awt.BorderLayout;
import java.awt.Container;
+import java.awt.Dimension;
import java.awt.FlowLayout;
+import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import javax.swing.JMenuItem;
-import javax.swing.JFrame;
-import javax.swing.JToggleButton;
-import javax.swing.AbstractAction;
-import javax.swing.AbstractButton;
-import java.util.Vector;
import java.util.HashSet;
import java.util.Set;
+import java.util.Vector;
-import org.jfree.data.xy.XYSeries;
-import org.jfree.data.xy.DefaultTableXYDataset;
+import javax.swing.AbstractAction;
+import javax.swing.AbstractButton;
+import javax.swing.JFrame;
+import javax.swing.JMenuItem;
+import javax.swing.JToggleButton;
+
+import org.apache.log4j.Logger;
+import org.jfree.chart.ChartFactory;
import org.jfree.chart.ChartPanel;
-import org.jfree.chart.ChartFactory;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.labels.StandardXYToolTipGenerator;
+import org.jfree.chart.plot.DefaultDrawingSupplier;
+import org.jfree.chart.plot.Plot;
import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.plot.XYPlot;
import org.jfree.chart.renderer.xy.XYAreaRenderer;
+import org.jfree.chart.renderer.xy.XYBarRenderer;
import org.jfree.chart.renderer.xy.XYItemRenderer;
import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
-import org.jfree.chart.renderer.xy.XYBarRenderer;
-import org.jfree.chart.plot.DefaultDrawingSupplier;
-import org.jfree.chart.labels.StandardXYToolTipGenerator;
import org.jfree.chart.urls.StandardXYURLGenerator;
-import org.jfree.chart.plot.XYPlot;
+import org.jfree.data.xy.DefaultTableXYDataset;
+import org.jfree.data.xy.XYSeries;
-import org.apache.log4j.Logger;
-
-import schmitzm.swing.JPanel;
-import schmitzm.swing.ButtonGroup;
-import schmitzm.swing.MultiSplitPane;
-import schmitzm.swing.table.MutableTable;
-import schmitzm.swing.table.AbstractMutableTableModel;
-import schmitzm.data.property.Property;
-import schmitzm.data.property.ValueProperty;
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 edu.bonn.xulu.XuluModellingPlatform;
import edu.bonn.xulu.appl.VisualisationTool;
import edu.bonn.xulu.appl.VisualisationUpdateListener;
import edu.bonn.xulu.appl.XuluConstants;
-import static schmitzm.jfree.JFreeChartUtil.RESOURCE;
-import static edu.bonn.xulu.appl.XuluConstants.XULU_VIS_RES;
-
/**
* Diese Klasse stellt ein Visualisierungstool dar, in dem Zahlenreihen in Form
* von Charts angezeigt werden koennen. Folgende Datentypen werden unterstuetzt:
More information about the Xulu-commits
mailing list