Add Svn history

data/input/fishLight.xml

@@ -15,7 +15,7 @@
 					<distance>10</distance>
 				</pikelake.pikes.PikeMovement>
 				<pikelake.pikes.PikeHuntProcess>
-					<satiety>0.5</satiety>
+					<!--satiety>0.5</satiety-->
 				</pikelake.pikes.PikeHuntProcess>
 				<pikelake.pikes.PikeGrowthProcess>
 					<convertionFactor>0.25</convertionFactor>

src/main/java/pikelake/environment/Movement2DWithinShapeObserver.java

@@ -61,8 +61,8 @@ public class Movement2DWithinShapeObserver extends ObserverListener implements C
     private transient List<Color> groupsColors;
     @Description (name="Background color",tooltip="Background color")
     private Color bgColor;
-    @Description (name="Pikes color",tooltip="Pikes color")			///////////////
-    private Color pikeColor;										/////////
+    @Description (name="Pikes color",tooltip="Pikes color")
+    private Color pikeColor;
     @Description (name="River color",tooltip="River color")
     private Color shapeColor;
     
@@ -117,38 +117,34 @@ public class Movement2DWithinShapeObserver extends ObserverListener implements C
         displayWidthBak = 0;
         displayHeightBak = 0;
         
-        // init shape ////////////////////////////////////////////////////////////
-
-        //File file = JFileDataStoreChooser.showOpenFile("shp", null);
+        
+        /////////////////////////// init shape ////////////////////////////////////////////////////////////
         File file = new File("/Users/guillaume.garbay/workspace/PikeLake/data/input/shape/hsi_BROPRINTEMPS513_5.shp");
 
         FileDataStore store;
 		try {
 			store = FileDataStoreFinder.getDataStore(file);
 			SimpleFeatureSource featureSource = store.getFeatureSource();
-		
-        
+      
+        MapContent map = new MapContent();
+        map.setTitle("Bariousses");
 
-        // Create a map content and add our shapefile to it
-        MapContent display = new MapContent();
-        display.setTitle("Bariousses");
-        
         Style style = SLD.createSimpleStyle(featureSource.getSchema());
         Layer layer = new FeatureLayer(featureSource, (org.geotools.styling.Style) style);
-        display.addLayer(layer);
+        map.addLayer(layer);
 
-        // Now display the map
-        JMapFrame.showMap(display);
+        JMapFrame.showMap(map);
+
+
+        this.generalPath = new GeneralPath((Shape) map);
+        //this.generalPath = new GeneralPath(((AsShapeConvertible) pilot.getAquaticWorld().getEnvironment()).getShape());
         
+
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		System.out.println(generalPath);
-        this.generalPath = new GeneralPath(((AsShapeConvertible)pilot.getAquaticWorld().getEnvironment()).getShape());
-        
-        System.out.println(generalPath);
-        
+                  
         // original dimension storage 
         this.shapeOriginalWidth = this.generalPath.getBounds().getWidth();
         this.shapeOriginalHeight = this.generalPath.getBounds().getHeight();
@@ -172,8 +168,6 @@ public class Movement2DWithinShapeObserver extends ObserverListener implements C
         groupsColors.add(Color.CYAN);
         groupsColors.add(Color.GRAY);
         display.repaint();
-        
-
     }
     
     public void disable() {
@@ -181,12 +175,12 @@ public class Movement2DWithinShapeObserver extends ObserverListener implements C
     }
 
     @Override
-    public void addObservable(ObservablesHandler classObservable) {			///////////////////////////////////
+    public void addObservable(ObservablesHandler classObservable) {
         // nothing to do
     }
 
     @Override
-    public void valueChanged(ObservablesHandler clObservable, Object instance, long t) {		////////////////////
+    public void valueChanged(ObservablesHandler clObservable, Object instance, long t) {
         display.repaint();
     }
     
@@ -201,17 +195,16 @@ public class Movement2DWithinShapeObserver extends ObserverListener implements C
         display.repaint();
     }
 
-    public void addObservable(ObserverListener classObservable) {				////////////////////////
+    public void addObservable(ObserverListener classObservable) {
         // nothing to do
     }
 
     public void close() {
         // nothing to do
-        
     }
-    
+
     private class DisplayComponent extends JComponent {
-        
+
         @Override
         protected synchronized void paintComponent(Graphics g) {
             super.paintComponents(g);