code clean

meteoinfo · Mar 9, 2024 · f7a6a83 · f7a6a83
1 parent cec3264
commit f7a6a83
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 10 deletions.
diff --git a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layout/LayoutGraphic.java b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layout/LayoutGraphic.java
@@ -14,7 +14,7 @@
 package org.meteoinfo.geo.layout;
 
 import org.meteoinfo.common.*;
-import org.meteoinfo.geo.drawing.Draw;
+import org.meteoinfo.render.java2d.Draw;
 import org.meteoinfo.geometry.graphic.ResizeAbility;
 import org.meteoinfo.geometry.legend.*;
 import org.meteoinfo.ui.event.IMapViewUpdatedListener;

diff --git a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layout/LayoutLegend.java b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layout/LayoutLegend.java
@@ -15,7 +15,7 @@
 
 import org.meteoinfo.common.DataConvert;
 import org.meteoinfo.common.PointF;
-import org.meteoinfo.geo.drawing.Draw;
+import org.meteoinfo.render.java2d.Draw;
 import org.meteoinfo.geometry.graphic.ResizeAbility;
 import org.meteoinfo.geometry.legend.*;
 import org.meteoinfo.ui.event.IMapViewUpdatedListener;

diff --git a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layout/LayoutNorthArrow.java b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/layout/LayoutNorthArrow.java
@@ -15,7 +15,7 @@
 
 import com.l2fprod.common.beans.BaseBeanInfo;
 import org.meteoinfo.common.PointF;
-import org.meteoinfo.geo.drawing.Draw;
+import org.meteoinfo.render.java2d.Draw;
 import org.meteoinfo.geometry.graphic.ResizeAbility;
 
 import java.awt.BasicStroke;

diff --git a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/legend/LayersLegend.java b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/legend/LayersLegend.java
@@ -18,7 +18,7 @@
 import org.meteoinfo.common.GenericFileFilter;
 import org.meteoinfo.common.PointF;
 import org.meteoinfo.geo.mapdata.MapDataManage;
-import org.meteoinfo.geo.drawing.Draw;
+import org.meteoinfo.render.java2d.Draw;
 import org.meteoinfo.geometry.legend.*;
 import org.meteoinfo.ui.event.ActiveMapFrameChangedEvent;
 import org.meteoinfo.ui.event.IActiveMapFrameChangedListener;

diff --git a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/legend/LegendManage.java b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/legend/LegendManage.java
@@ -18,7 +18,7 @@
 import org.meteoinfo.data.GridArray;
 import org.meteoinfo.data.GridData;
 import org.meteoinfo.data.StationData;
-import org.meteoinfo.geo.drawing.ContourDraw;
+import org.meteoinfo.render.java2d.ContourDraw;
 import org.meteoinfo.geometry.colors.Normalize;
 import org.meteoinfo.geometry.colors.TransferFunction;
 import org.meteoinfo.geometry.legend.*;

diff --git a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/legend/LegendView.java b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/legend/LegendView.java
@@ -15,7 +15,7 @@
 
 import org.meteoinfo.common.MIMath;
 import org.meteoinfo.common.PointF;
-import org.meteoinfo.geo.drawing.Draw;
+import org.meteoinfo.render.java2d.Draw;
 import org.meteoinfo.geometry.legend.*;
 
 import java.awt.BorderLayout;

diff --git a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/legend/SymbolControl.java b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/legend/SymbolControl.java
@@ -14,7 +14,7 @@
 package org.meteoinfo.geo.legend;
 
 import org.meteoinfo.common.PointF;
-import org.meteoinfo.geo.drawing.Draw;
+import org.meteoinfo.render.java2d.Draw;
 import org.meteoinfo.geometry.legend.*;
 import org.meteoinfo.ui.event.ISelectedCellChangedListener;
 import org.meteoinfo.ui.event.SelectedCellChangedEvent;

diff --git a/meteoinfo-geo/src/main/java/org/meteoinfo/geo/mapview/MapView.java b/meteoinfo-geo/src/main/java/org/meteoinfo/geo/mapview/MapView.java
@@ -24,7 +24,7 @@
 import org.meteoinfo.common.*;
 import org.meteoinfo.common.util.GlobalUtil;
 import org.meteoinfo.geo.mapdata.MapDataManage;
-import org.meteoinfo.geo.drawing.Draw;
+import org.meteoinfo.render.java2d.Draw;
 import org.meteoinfo.geo.util.GeoProjectionUtil;
 import org.meteoinfo.geometry.legend.*;
 import org.meteoinfo.geometry.geoprocess.GeometryUtil;
@@ -150,7 +150,7 @@
 import org.meteoinfo.data.mapdata.webmap.IWebMapPanel;
 import org.meteoinfo.data.mapdata.webmap.TileLoadListener;
 import org.meteoinfo.data.mapdata.webmap.WebMapProvider;
-import static org.meteoinfo.geo.drawing.Draw.getHatchImage;
+import static org.meteoinfo.render.java2d.Draw.getHatchImage;
 import org.meteoinfo.common.DataConvert;
 import org.meteoinfo.ui.event.IShapeSelectedListener;
 import org.meteoinfo.ui.event.IUndoEditListener;

diff --git a/meteoinfo-lab/pylib/mipylib/geolib/_graphic.py b/meteoinfo-lab/pylib/mipylib/geolib/_graphic.py
@@ -1,4 +1,4 @@
-from org.meteoinfo.geo.graphic import GeoGraphicCollection as JGeoGraphicCollection
+from org.meteoinfo.chart.graphic import GeoGraphicCollection as JGeoGraphicCollection
 from java.awt import Font
 
 import mipylib.miutil as miutil