Improved; documentation in TestTools. Converted; geometric fixtures t…

…o JML format.
hastebrot · Jan 10, 2012 · 8e064ee · 8e064ee
1 parent 9afbce9
commit 8e064ee
Show file tree

Hide file tree

Showing 15 changed files with 359 additions and 48 deletions.
diff --git a/share/dissolve.dbf b/share/dissolve.dbf
diff --git a/share/dissolve.jml b/share/dissolve.jml
@@ -0,0 +1,104 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<JCSDataFile xmlns:gml="http://www.opengis.net/gml" xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance" >
+<JCSGMLInputTemplate>
+<CollectionElement>featureCollection</CollectionElement> 
+<FeatureElement>feature</FeatureElement>
+<GeometryElement>geometry</GeometryElement>
+<ColumnDefinitions>
+     <column>
+          <name>LABEL</name>
+          <type>STRING</type>
+          <valueElement elementName="property" attributeName="name" attributeValue="LABEL"/>
+          <valueLocation position="body"/>
+     </column>
+</ColumnDefinitions>
+</JCSGMLInputTemplate>
+
+<featureCollection>
+     <feature> 
+          <geometry>
+                <gml:Polygon>
+                  <gml:outerBoundaryIs>
+                  <gml:LinearRing>
+                    <gml:coordinates>220.0,900.0 
+                      220.0,960.0 
+                      280.0,960.0 
+                      280.0,900.0 
+                      220.0,900.0 </gml:coordinates>
+                  </gml:LinearRing>
+                  </gml:outerBoundaryIs>
+                </gml:Polygon>
+          </geometry>
+          <property name="LABEL">A</property>
+     </feature>
+
+     <feature> 
+          <geometry>
+                <gml:Polygon>
+                  <gml:outerBoundaryIs>
+                  <gml:LinearRing>
+                    <gml:coordinates>260.0,860.0 
+                      260.0,920.0 
+                      320.0,920.0 
+                      320.0,860.0 
+                      260.0,860.0 </gml:coordinates>
+                  </gml:LinearRing>
+                  </gml:outerBoundaryIs>
+                </gml:Polygon>
+          </geometry>
+          <property name="LABEL">A</property>
+     </feature>
+
+     <feature> 
+          <geometry>
+                <gml:Polygon>
+                  <gml:outerBoundaryIs>
+                  <gml:LinearRing>
+                    <gml:coordinates>360.0,880.0 
+                      360.0,940.0 
+                      420.0,940.0 
+                      420.0,880.0 
+                      360.0,880.0 </gml:coordinates>
+                  </gml:LinearRing>
+                  </gml:outerBoundaryIs>
+                </gml:Polygon>
+          </geometry>
+          <property name="LABEL">B</property>
+     </feature>
+
+     <feature> 
+          <geometry>
+                <gml:Polygon>
+                  <gml:outerBoundaryIs>
+                  <gml:LinearRing>
+                    <gml:coordinates>420.0,880.0 
+                      420.0,940.0 
+                      480.0,940.0 
+                      480.0,880.0 
+                      420.0,880.0 </gml:coordinates>
+                  </gml:LinearRing>
+                  </gml:outerBoundaryIs>
+                </gml:Polygon>
+          </geometry>
+          <property name="LABEL">B</property>
+     </feature>
+
+     <feature> 
+          <geometry>
+                <gml:Polygon>
+                  <gml:outerBoundaryIs>
+                  <gml:LinearRing>
+                    <gml:coordinates>260.0,780.0 
+                      260.0,840.0 
+                      320.0,840.0 
+                      320.0,780.0 
+                      260.0,780.0 </gml:coordinates>
+                  </gml:LinearRing>
+                  </gml:outerBoundaryIs>
+                </gml:Polygon>
+          </geometry>
+          <property name="LABEL">A</property>
+     </feature>
+
+     </featureCollection>
+</JCSDataFile>
diff --git a/share/dissolve.shp b/share/dissolve.shp
diff --git a/share/dissolve.shx b/share/dissolve.shx
diff --git a/share/inner-ring-invalid.jml b/share/inner-ring-invalid.jml
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<JCSDataFile xmlns:gml="http://www.opengis.net/gml" xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance" >
+<JCSGMLInputTemplate>
+<CollectionElement>featureCollection</CollectionElement> 
+<FeatureElement>feature</FeatureElement>
+<GeometryElement>geometry</GeometryElement>
+<ColumnDefinitions>
+</ColumnDefinitions>
+</JCSGMLInputTemplate>
+
+<featureCollection>
+     <feature> 
+          <geometry>
+                <gml:Polygon>
+                  <gml:outerBoundaryIs>
+                  <gml:LinearRing>
+                    <gml:coordinates>220.0,600.0 
+                      220.0,760.0 
+                      380.0,760.0 
+                      440.0,760.0 
+                      440.0,600.0 
+                      220.0,600.0 </gml:coordinates>
+                  </gml:LinearRing>
+                  </gml:outerBoundaryIs>
+                  <gml:innerBoundaryIs>
+                  <gml:LinearRing>
+                    <gml:coordinates>380.0,760.0 
+                      280.0,740.0 
+                      280.0,640.0 
+                      380.0,640.0 
+                      380.0,760.0 </gml:coordinates>
+                  </gml:LinearRing>
+                  </gml:innerBoundaryIs>
+                </gml:Polygon>
+          </geometry>
+     </feature>
+
+     <feature> 
+          <geometry>
+                <gml:Polygon>
+                  <gml:outerBoundaryIs>
+                  <gml:LinearRing>
+                    <gml:coordinates>220.0,580.0 
+                      380.0,580.0 
+                      280.0,560.0 
+                      280.0,460.0 
+                      380.0,460.0 
+                      380.0,580.0 
+                      440.0,580.0 
+                      440.0,420.0 
+                      220.0,420.0 
+                      220.0,580.0 </gml:coordinates>
+                  </gml:LinearRing>
+                  </gml:outerBoundaryIs>
+                </gml:Polygon>
+          </geometry>
+     </feature>
+
+     </featureCollection>
+</JCSDataFile>
diff --git a/share/inner-ring.jml b/share/inner-ring.jml
@@ -0,0 +1,45 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<JCSDataFile xmlns:gml="http://www.opengis.net/gml" xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance" >
+<JCSGMLInputTemplate>
+<CollectionElement>featureCollection</CollectionElement> 
+<FeatureElement>feature</FeatureElement>
+<GeometryElement>geometry</GeometryElement>
+<ColumnDefinitions>
+</ColumnDefinitions>
+</JCSGMLInputTemplate>
+
+<featureCollection>
+     <feature> 
+          <geometry>
+                <gml:Polygon>
+                  <gml:outerBoundaryIs>
+                  <gml:LinearRing>
+                    <gml:coordinates>220.0,600.0 
+                      220.0,760.0 
+                      440.0,760.0 
+                      440.0,600.0 
+                      220.0,600.0 </gml:coordinates>
+                  </gml:LinearRing>
+                  </gml:outerBoundaryIs>
+                </gml:Polygon>
+          </geometry>
+     </feature>
+
+     <feature> 
+          <geometry>
+                <gml:Polygon>
+                  <gml:outerBoundaryIs>
+                  <gml:LinearRing>
+                    <gml:coordinates>280.0,740.0 
+                      280.0,640.0 
+                      380.0,640.0 
+                      380.0,760.0 
+                      280.0,740.0 </gml:coordinates>
+                  </gml:LinearRing>
+                  </gml:outerBoundaryIs>
+                </gml:Polygon>
+          </geometry>
+     </feature>
+
+     </featureCollection>
+</JCSDataFile>
diff --git a/src/org/openjump/tools/plugin/UnionByAttributePlugInTest.java b/src/org/openjump/tools/plugin/UnionByAttributePlugInTest.java
@@ -1,7 +1,7 @@
 /*
  * The Unified Mapping Platform (JUMP) is an extensible, interactive GUI for 
  * visualizing and manipulating spatial features with geometry and attributes.
- * Copyright (C) 2011  The JUMP/OpenJUMP contributors
+ * Copyright (C) 2012  The JUMP/OpenJUMP contributors
  * 
  * This program is free software: you can redistribute it and/or modify it 
  * under the terms of the GNU General Public License as published by the Free 
@@ -84,7 +84,7 @@ public static void afterClass() {
     @Test
     public void testAddedResultLayer() throws Exception {
         // given: "a loaded shapefile fixture"
-        TestTools.openFile(new File("share/dissolve.shp"), workbench.getContext());
+        TestTools.openFile(new File("share/dissolve.jml"), workbench.getContext());
 
         // and: "plugin with dialog values"
         PlugIn plugin = new UnionByAttributePlugIn();

diff --git a/src/org/openjump/tools/plugin/package-info.java b/src/org/openjump/tools/plugin/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * The Unified Mapping Platform (JUMP) is an extensible, interactive GUI for 
+ * visualizing and manipulating spatial features with geometry and attributes.
+ * Copyright (C) 2012  The JUMP/OpenJUMP contributors
+ * 
+ * This program is free software: you can redistribute it and/or modify it 
+ * under the terms of the GNU General Public License as published by the Free 
+ * Software Foundation, either version 2 of the License, or (at your option) 
+ * any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT 
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along 
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Plugins from the tools menu.
+ */
+package org.openjump.tools.plugin;
diff --git a/src/org/openjump/tools/test/DialogParameters.java b/src/org/openjump/tools/test/DialogParameters.java
@@ -1,7 +1,7 @@
 /*
  * The Unified Mapping Platform (JUMP) is an extensible, interactive GUI for 
  * visualizing and manipulating spatial features with geometry and attributes.
- * Copyright (C) 2011  The JUMP/OpenJUMP contributors
+ * Copyright (C) 2012  The JUMP/OpenJUMP contributors
  * 
  * This program is free software: you can redistribute it and/or modify it 
  * under the terms of the GNU General Public License as published by the Free 

diff --git a/src/org/openjump/tools/test/DialogParametersTest.java b/src/org/openjump/tools/test/DialogParametersTest.java
@@ -1,7 +1,7 @@
 /*
  * The Unified Mapping Platform (JUMP) is an extensible, interactive GUI for 
  * visualizing and manipulating spatial features with geometry and attributes.
- * Copyright (C) 2011  The JUMP/OpenJUMP contributors
+ * Copyright (C) 2012  The JUMP/OpenJUMP contributors
  * 
  * This program is free software: you can redistribute it and/or modify it 
  * under the terms of the GNU General Public License as published by the Free 

diff --git a/src/org/openjump/tools/test/ReflectionUtils.java b/src/org/openjump/tools/test/ReflectionUtils.java
@@ -1,7 +1,7 @@
 /*
  * The Unified Mapping Platform (JUMP) is an extensible, interactive GUI for 
  * visualizing and manipulating spatial features with geometry and attributes.
- * Copyright (C) 2011  The JUMP/OpenJUMP contributors
+ * Copyright (C) 2012  The JUMP/OpenJUMP contributors
  * 
  * This program is free software: you can redistribute it and/or modify it 
  * under the terms of the GNU General Public License as published by the Free 

diff --git a/src/org/openjump/tools/test/ReflectionUtilsTest.java b/src/org/openjump/tools/test/ReflectionUtilsTest.java
@@ -1,7 +1,7 @@
 /*
  * The Unified Mapping Platform (JUMP) is an extensible, interactive GUI for 
  * visualizing and manipulating spatial features with geometry and attributes.
- * Copyright (C) 2011  The JUMP/OpenJUMP contributors
+ * Copyright (C) 2012  The JUMP/OpenJUMP contributors
  * 
  * This program is free software: you can redistribute it and/or modify it 
  * under the terms of the GNU General Public License as published by the Free 

diff --git a/src/org/openjump/tools/test/TestTools.java b/src/org/openjump/tools/test/TestTools.java
@@ -1,7 +1,7 @@
 /*
  * The Unified Mapping Platform (JUMP) is an extensible, interactive GUI for 
  * visualizing and manipulating spatial features with geometry and attributes.
- * Copyright (C) 2011  The JUMP/OpenJUMP contributors
+ * Copyright (C) 2012  The JUMP/OpenJUMP contributors
  * 
  * This program is free software: you can redistribute it and/or modify it 
  * under the terms of the GNU General Public License as published by the Free 
@@ -87,6 +87,12 @@ public static JUMPWorkbench buildWorkbench(String[] args) throws Exception {
         return workbench;
     }
 
+    /**
+     * Opens a geometric fixture in the task panel.
+     * 
+     * @param file File
+     * @param context Context.
+     */
     public static void openFile(File file, WorkbenchContext context) {
         OpenFilePlugIn filePlugin = new OpenFilePlugIn(context, file);
         filePlugin.actionPerformed(new ActionEvent(filePlugin, 0, ""));
@@ -99,11 +105,10 @@ public static void installPlugIn(PlugIn plugin, WorkbenchContext context)
     }
 
     /**
-     * Configure PlugIn via fields in the object. Replaces the configuration of the 
-     * plugin via an user dialog in PlugIn.execute().
+     * Configures execution parameters for {@link PlugIn} using its instance fields.
      * 
-     * @param plugin
-     * @param parameters
+     * @param plugin Plugin.
+     * @param parameters Execution parameters.
      */
     public static void configurePlugIn(PlugIn plugin, Map<String, Object> parameters)
             throws Exception {
@@ -113,12 +118,11 @@ public static void configurePlugIn(PlugIn plugin, Map<String, Object> parameters
     }
 
     /**
-     * Configure PlugIn via a dialog field. Replaces the configuration of the 
-     * plugin via an user dialog in PlugIn.execute().
+     * Configures execution parameters for {@link PlugIn} using a new user dialog.
      * 
-     * @param plugin
-     * @param parameters
-     * @param retrieveFieldNamesFromPlugIn
+     * @param plugin Plugin.
+     * @param parameters Execution parameters.
+     * @param retrieveFieldNamesFromPlugIn Retrieve {@link I18N} string names.
      */
     public static void configurePlugIn(PlugIn plugin, Map<String, Object> parameters, 
             boolean retrieveFieldNamesFromPlugIn) throws Exception {
@@ -136,9 +140,10 @@ public static void configurePlugIn(PlugIn plugin, Map<String, Object> parameters
     }
 
     /**
+     * Executes operations of the {@link Plugin}.
      * 
-     * @param plugin
-     * @param context
+     * @param plugin Plugin.
+     * @param context Context.
      * @see com.vividsolutions.jump.workbench.plugin.AbstractPlugIn#toActionListener
      */
     public static void executePlugIn(PlugIn plugin, WorkbenchContext context)