Revision: 4768
http://sourceforge.net/p/jump-pilot/code/4768
Author: edso
Date: 2016-01-10 18:47:43 +0000 (Sun, 10 Jan 2016)
Log Message:
-----------
adapt to new Logger
Modified Paths:
--------------
core/trunk/src/de/latlon/deejump/wfs/client/WFSClientHelper.java
core/trunk/src/org/deegree/datatypes/QualifiedName.java
core/trunk/src/org/deegree/model/spatialschema/GMLGeometryAdapter.java
core/trunk/src/org/deegree/model/spatialschema/JTSAdapter.java
core/trunk/src/org/openide/awt/DropDownButton.java
core/trunk/src/org/openide/awt/DropDownToggleButton.java
core/trunk/src/org/openjump/core/rasterimage/RasterImageLayer.java
core/trunk/src/org/openjump/core/rasterimage/styler/ui/CustomGradientColorsDialog.java
core/trunk/src/org/openjump/core/rasterimage/styler/ui/GradientTablePanel.java
core/trunk/src/org/openjump/core/rasterimage/styler/ui/IntervalPanel.java
core/trunk/src/org/openjump/core/rasterimage/styler/ui/RasterStylesDialog.java
core/trunk/src/org/openjump/core/rasterimage/styler/ui/SingleValuesPanel.java
core/trunk/src/org/openjump/core/ui/plugin/customize/PythonToolsPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/AddWritableDataStoreLayerWizard.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis2/PostGISDataStoreDataSource.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManager.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManagerPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/Evolution.java
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/TransactionManagerPanel.java
core/trunk/src/org/openjump/core/ui/plugin/mousemenu/category/SetCategoryVisibilityPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterImageLayerPropertiesPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/raster/nodata/ChangeRangeValuesToNoDataPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/style/ImportSLDPlugIn.java
core/trunk/src/org/openjump/core/ui/plugin/view/SuperZoomPanTool.java
core/trunk/src/org/openjump/core/ui/plugin/wms/ZoomToWMSLayerPlugIn.java
core/trunk/src/org/openjump/util/CustomTexturePaint.java
core/trunk/src/org/openjump/util/SLDImporter.java
core/trunk/src/org/openjump/util/XPathUtils.java
core/trunk/src/org/saig/core/crypt/BlowFishManager.java
core/trunk/src/org/saig/core/crypt/PBEManager.java
core/trunk/src/org/saig/jump/lang/I18N.java
core/trunk/src/org/saig/jump/widgets/config/HTTPProxySettings.java
core/trunk/src/org/saig/jump/widgets/util/AbstractWaitDialog.java
Modified: core/trunk/src/de/latlon/deejump/wfs/client/WFSClientHelper.java
===================================================================
--- core/trunk/src/de/latlon/deejump/wfs/client/WFSClientHelper.java
2016-01-10 18:45:58 UTC (rev 4767)
+++ core/trunk/src/de/latlon/deejump/wfs/client/WFSClientHelper.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -58,6 +58,8 @@
import org.deegree.framework.log.LoggerFactory;
import org.deegree.framework.util.CharsetUtils;
+import com.vividsolutions.jump.workbench.Logger;
+
import de.latlon.deejump.wfs.DeeJUMPException;
/**
@@ -71,8 +73,6 @@
*/
public class WFSClientHelper {
- private static ILogger LOG = LoggerFactory.getLogger(WFSClientHelper.class);
-
/**
* convenience method, big datasets tend to flood your memory
*
@@ -108,7 +108,7 @@
*/
public static InputStream createResponseStreamfromWFS(String serverUrl,
String postData) throws DeeJUMPException {
- LOG.logDebug("WFS GetFeature: " + serverUrl + " -> " + postData);
+ Logger.debug("WFS GetFeature: " + serverUrl + " -> " + postData);
//System.out.println(serverUrl);
HttpClient httpclient = new WFSHttpClient();
Modified: core/trunk/src/org/deegree/datatypes/QualifiedName.java
===================================================================
--- core/trunk/src/org/deegree/datatypes/QualifiedName.java 2016-01-10
18:45:58 UTC (rev 4767)
+++ core/trunk/src/org/deegree/datatypes/QualifiedName.java 2016-01-10
18:47:43 UTC (rev 4768)
@@ -48,6 +48,8 @@
import org.deegree.framework.log.LoggerFactory;
import org.deegree.framework.util.StringTools;
+import com.vividsolutions.jump.workbench.Logger;
+
/**
* This class represent a qualified name for something. A name is thought to
be built from an optional prefix and/or a
* local name E.g.: <BR>- deegree - pre:deegree <BR>
@@ -63,8 +65,6 @@
private static final long serialVersionUID = 5551137348397905772L;
- private static final ILogger LOG = LoggerFactory.getLogger(
QualifiedName.class );
-
private String prefix = null;
private String localName = null;
@@ -93,7 +93,7 @@
this.namespace = new URI( name.getNamespaceURI() );
buildString();
} catch ( URISyntaxException e ) {
- LOG.logError( "Invalid URI: " + e.getMessage(), e );
+ Logger.error( "Invalid URI: " + e.getMessage(), e );
}
}
Modified: core/trunk/src/org/deegree/model/spatialschema/GMLGeometryAdapter.java
===================================================================
--- core/trunk/src/org/deegree/model/spatialschema/GMLGeometryAdapter.java
2016-01-10 18:45:58 UTC (rev 4767)
+++ core/trunk/src/org/deegree/model/spatialschema/GMLGeometryAdapter.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -57,7 +57,6 @@
import org.apache.commons.lang.StringUtils;
import org.deegree.framework.log.ILogger;
-import org.deegree.framework.log.LoggerFactory;
import org.deegree.framework.util.StringTools;
import org.deegree.framework.xml.ElementList;
import org.deegree.framework.xml.NamespaceContext;
@@ -74,6 +73,8 @@
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import com.vividsolutions.jump.workbench.Logger;
+
/**
* Adapter class for converting GML geometries to deegree geometries and vice
versa. Some logical
* problems results from the fact that an envelope isn't a geometry according
to ISO 19107 (where
@@ -94,8 +95,6 @@
*/
public class GMLGeometryAdapter {
- protected static final ILogger LOG =
LoggerFactory.getLogger(GMLGeometryAdapter.class);
-
protected static final NamespaceContext nsContext =
CommonNamespaces.getNamespaceContext();
protected static Map<String, CoordinateSystem> crsMap = new
HashMap<String, CoordinateSystem>();
@@ -135,8 +134,8 @@
try {
doc = XMLTools.parse(sr);
} catch (Exception e) {
-
LOG.logError(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.could-not-parse")
+ ": '" + gml + "' " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.as-gml-xml"),
e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- throw new
XMLParsingException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.could-not-parse")
+ ": '" + gml + "' " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.as-gml-xml")
+ e.getMessage()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+
Logger.error(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.could-not-parse")
+ ": '" + gml + "' " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.as-gml-xml"),
e);
+ throw new
XMLParsingException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.could-not-parse")
+ ": '" + gml + "' " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.as-gml-xml")
+ e.getMessage());
}
return wrap(doc.getDocumentElement(), srsName);
}
@@ -172,35 +171,35 @@
Geometry geometry = null;
try {
String name = element.getLocalName();
- if ((name.equals("Point")) || (name.equals("Center"))) {
//$NON-NLS-1$ //$NON-NLS-2$
+ if ((name.equals("Point")) || (name.equals("Center"))) {
geometry = wrapPoint(element, srsName);
- } else if (name.equals("LineString")) { //$NON-NLS-1$
+ } else if (name.equals("LineString")) {
geometry = wrapLineString(element, srsName);
- } else if (name.equals("Polygon")) { //$NON-NLS-1$
+ } else if (name.equals("Polygon")) {
geometry = wrapPolygon(element, srsName);
- } else if (name.equals("MultiPoint")) { //$NON-NLS-1$
+ } else if (name.equals("MultiPoint")) {
geometry = wrapMultiPoint(element, srsName);
- } else if (name.equals("MultiLineString")) { //$NON-NLS-1$
+ } else if (name.equals("MultiLineString")) {
geometry = wrapMultiLineString(element, srsName);
- } else if (name.equals("MultiPolygon")) { //$NON-NLS-1$
+ } else if (name.equals("MultiPolygon")) {
geometry = wrapMultiPolygon(element, srsName);
- } else if (name.equals("Box") || name.equals("Envelope")) {
//$NON-NLS-1$ //$NON-NLS-2$
+ } else if (name.equals("Box") || name.equals("Envelope")) {
geometry = wrapBoxAsSurface(element, srsName);
- } else if (name.equals("Curve")) { //$NON-NLS-1$
+ } else if (name.equals("Curve")) {
geometry = wrapCurveAsCurve(element, srsName);
- } else if (name.equals("Surface")) { //$NON-NLS-1$
+ } else if (name.equals("Surface")) {
geometry = wrapSurfaceAsSurface(element, srsName);
- } else if (name.equals("MultiCurve")) { //$NON-NLS-1$
+ } else if (name.equals("MultiCurve")) {
geometry = wrapMultiCurveAsMultiCurve(element, srsName);
- } else if (name.equals("MultiSurface")) { //$NON-NLS-1$
+ } else if (name.equals("MultiSurface")) {
geometry = wrapMultiSurfaceAsMultiSurface(element, srsName);
- } else if (name.equals("CompositeSurface")) { //$NON-NLS-1$
+ } else if (name.equals("CompositeSurface")) {
geometry = wrapCompositeSurface(element, srsName);
} else {
- new
GeometryException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.not-a-supported-geometry-type")
+ ": " + name); //$NON-NLS-1$ //$NON-NLS-2$
+ new
GeometryException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.not-a-supported-geometry-type")
+ ": " + name);
}
} catch (Exception e) {
- LOG.logError(e.getMessage(), e);
+ Logger.error(e.getMessage(), e);
throw new GeometryException(StringTools.stackTraceToString(e));
}
return geometry;
@@ -297,12 +296,12 @@
CurveSegment[] segments = new CurveSegment[list.size()];
for( int i = 0; i < list.size(); i++ ) {
- if (list.get(i).getLocalName().equals("LineStringSegment")) {
//$NON-NLS-1$
+ if (list.get(i).getLocalName().equals("LineStringSegment")) {
segments[i] = parseLineStringSegment((Element) list.get(i),
crs, srsDimension);
- } else if (list.get(i).getLocalName().equals("Arc")) {
//$NON-NLS-1$
+ } else if (list.get(i).getLocalName().equals("Arc")) {
segments[i] = parseArc((Element) list.get(i), crs,
srsDimension);
} else {
- throw new
GeometryException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.not-supported-type-for-a-curvesegment")
+ ": " + list.get(i).getLocalName()); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new
GeometryException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.not-supported-type-for-a-curvesegment")
+ ": " + list.get(i).getLocalName());
}
}
return segments;
@@ -324,7 +323,7 @@
Position[] pos = createPositions(element, null, srsDimension);
segment = GeometryFactory.createCurveSegment(pos, crs);
} catch (Exception e) {
- throw new
GeometryException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-creating-segments-for-the-element-arc")
+ "."); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new
GeometryException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-creating-segments-for-the-element-arc")
+ ".");
}
return segment;
}
@@ -345,7 +344,7 @@
Position[] pos = createPositions(element, null, srsDimension);
segment = GeometryFactory.createCurveSegment(pos, crs);
} catch (Exception e) {
- throw new
GeometryException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-creating-segments-for-the-element-linestringsegment")
+ "."); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new
GeometryException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-creating-segments-for-the-element-linestringsegment")
+ ".");
}
return segment;
@@ -414,11 +413,11 @@
Curve[] curves = new Curve[curveList.size()];
multiCurve =
GeometryFactory.createMultiCurve(curveList.toArray(curves), crs);
} catch (XMLParsingException e) {
- LOG.logError(e.getMessage(), e);
- throw new
XMLParsingException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-parsing")
+ "<gml:curveMember> " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.elements") +
". " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.please-check-the-xml-document")
+ "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
//$NON-NLS-6$
+ Logger.error(e.getMessage(), e);
+ throw new
XMLParsingException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-parsing")
+ "<gml:curveMember> " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.elements") +
". " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.please-check-the-xml-document")
+ ".");
} catch (GeometryException e) {
- LOG.logError(e.getMessage(), e);
- throw new
GeometryException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-creating-a-curve-from-the-curve-element")
+ ". " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.please-check-the-gml-specifications-for-correct-element-declaration")
+ "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ Logger.error(e.getMessage(), e);
+ throw new
GeometryException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-creating-a-curve-from-the-curve-element")
+ ". " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.please-check-the-gml-specifications-for-correct-element-declaration")
+ ".");
}
return multiCurve;
}
@@ -464,7 +463,7 @@
}
List<Element> interiorList =
- XMLTools.getElements(polygon, "gml:interior |
gml:outerBounderyIs", //$NON-NLS-1$
+ XMLTools.getElements(polygon, "gml:interior |
gml:outerBounderyIs",
nsContext);
Curve[] interiorRings = null;
if (interiorList != null && interiorList.size() > 0) {
@@ -479,9 +478,9 @@
surfacePatches[i] =
GeometryFactory.createSurfacePatch(exteriorRing,
interiorRings, crs);
} catch (InvalidGMLException e) {
- LOG.logError(e.getMessage(), e);
- throw new
XMLParsingException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-parsing-the-polygon-element")
+ " '" + polygon.getNodeName() //$NON-NLS-1$ //$NON-NLS-2$
- + "' " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.to-create-a-surface-geometry")
+ "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ Logger.error(e.getMessage(), e);
+ throw new
XMLParsingException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-parsing-the-polygon-element")
+ " '" + polygon.getNodeName()
+ + "' " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.to-create-a-surface-geometry")
+ ".");
}
}
@@ -489,7 +488,7 @@
try {
surface = GeometryFactory.createSurface(surfacePatches, crs);
} catch (GeometryException e) {
- throw new
GeometryException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-creating-a-surface-from")
+ " '" + surfacePatches.length + "' " + "polygons" + "."); //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ throw new
GeometryException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-creating-a-surface-from")
+ " '" + surfacePatches.length + "' " + "polygons" + ".");
}
return surface;
}
@@ -615,12 +614,12 @@
surfaces = surfaceList.toArray(surfaces);
multiSurface = GeometryFactory.createMultiSurface(surfaces, crs);
} catch (XMLParsingException e) {
- LOG.logError(e.getMessage(), e);
+ Logger.error(e.getMessage(), e);
String msg =
"Error parsing <gml:surfaceMember> elements. Please check the
xml document.";
throw new XMLParsingException(msg);
} catch (GeometryException e) {
- LOG.logError(e.getMessage(), e);
+ Logger.error(e.getMessage(), e);
String msg =
"Error creating a multi surface from the MultiSurface element.
Please check the GML specifications for correct element declaration.";
throw new GeometryException(msg);
@@ -743,7 +742,7 @@
nl =
XMLTools.getRequiredNodes(inns.get(i),
CommonNamespaces.GML_PREFIX
- + ":LinearRing", //$NON-NLS-1$
+ + ":LinearRing",
nsContext);
ring = (Element) nl.get(0);
@@ -881,7 +880,7 @@
* @throws GeometryException
*/
private static CompositeSurface wrapCompositeSurface( Element element,
String srsName ) {
- throw new
UnsupportedOperationException("#wrapCompositeSurface(Element) " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.is-not-implemented-as-yet")
+ ". " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.work-in-progress")
+ "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ throw new
UnsupportedOperationException("#wrapCompositeSurface(Element) " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.is-not-implemented-as-yet")
+ ". " +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.work-in-progress")
+ ".");
}
/**
@@ -896,7 +895,7 @@
try {
patches = (Element) XMLTools.getRequiredNode(surface,
"gml:patches", nsContext);
} catch (XMLParsingException e) {
- throw new
XMLParsingException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-retrieving-the-patches-element-from-the-surface-element")
+ "."); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new
XMLParsingException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.error-retrieving-the-patches-element-from-the-surface-element")
+ ".");
}
return patches;
}
@@ -911,7 +910,7 @@
public static CoordinateSystem getCRS( String name ) throws
UnknownCRSException {
if ((name != null) && (name.length() > 2)) {
- if (name.startsWith("http://www.opengis.net/gml/srs/";)) {
//$NON-NLS-1$
+ if (name.startsWith("http://www.opengis.net/gml/srs/";)) {
// as declared in the GML 2.1.1 specification
// http://www.opengis.net/gml/srs/epsg.xml#4326
int p = name.lastIndexOf("/");
@@ -976,17 +975,17 @@
// urn:ogc:def:${operationName}:EPSG::${epsgCode}
// urn:ogc:def:${operationName}:EPSG:${epsgCode}
result = EPSG_SINGLE + StringUtils.substringAfterLast(name, ":");
- } else if (StringUtils.containsIgnoreCase(name, "epsg.xml")) {
//$NON-NLS-1$
+ } else if (StringUtils.containsIgnoreCase(name, "epsg.xml")) {
// http://www.opengis.net/gml/srs/epsg.xml#<EPSG code>
result = EPSG_SINGLE + StringUtils.substringAfterLast(name, "#");
- } else if (StringUtils.containsIgnoreCase(name, "urn:epsg")) {
//$NON-NLS-1$
+ } else if (StringUtils.containsIgnoreCase(name, "urn:epsg")) {
// urn:EPSG:geographicCRC:<epsg code>
result = EPSG_SINGLE + StringUtils.substringAfterLast(name, ":");
} else {
result = name;
}
- LOG.logDebug("Transformed from " + name + " to " + result);
//$NON-NLS-1$ //$NON-NLS-2$
+ Logger.debug("Transformed from " + name + " to " + result);
return result;
}
@@ -1001,7 +1000,7 @@
double[] vals = StringTools.toArrayDouble(tmp, ", ");
if (dim != 0) {
if (vals.length != dim) {
- throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.dimension-must-be-equal-to-the-number-of-coordinate-values-defined-in-pos-element")
+ "."); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.dimension-must-be-equal-to-the-number-of-coordinate-values-defined-in-pos-element")
+ ".");
}
} else {
dim = vals.length;
@@ -1055,11 +1054,11 @@
Position[] points = null;
// fixing the failure coming from the usage of the xmltools.getAttrib
method
- String ts = XMLTools.getAttrValue(element, null, "ts", " ");
//$NON-NLS-1$ //$NON-NLS-2$
+ String ts = XMLTools.getAttrValue(element, null, "ts", " ");
// not used because javas current decimal seperator will be used
// String ds = XMLTools.getAttrValue( element, null, "decimal", "." );
- String cs = XMLTools.getAttrValue(element, null, "cs", ",");
//$NON-NLS-1$ //$NON-NLS-2$
+ String cs = XMLTools.getAttrValue(element, null, "cs", ",");
String value = XMLTools.getStringValue(element).trim();
@@ -1104,19 +1103,19 @@
if (vals != null) {
if (dim != 0) {
if (vals.length != dim) {
- throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.dimension-must-be-equal-to-the-number-of-coordinate-values-defined-in-pos-element")
+ "."); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.dimension-must-be-equal-to-the-number-of-coordinate-values-defined-in-pos-element")
+ ".");
}
} else {
dim = vals.length;
}
} else {
- throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.the-given-element")
//$NON-NLS-1$
- + "{" //$NON-NLS-1$
+ throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.the-given-element")
+ + "{"
+ element.getNamespaceURI()
- + "}" //$NON-NLS-1$
+ + "}"
+ element.getLocalName()
- +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.does-not-contain-any-coordinates")
//$NON-NLS-1$
- + ". " //$NON-NLS-1$
+ +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.does-not-contain-any-coordinates")
+ + ". "
+
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.this-may-not-be"));
}
@@ -1149,9 +1148,9 @@
srsDimension = findSrsDimension(element);
}
- if (LOG.getLevel() == ILogger.LOG_DEBUG) {
+ if (Logger.isDebugEnabled()) {
XMLFragment doc = new XMLFragment(element);
- System.out.println(doc.getAsPrettyString());
+ Logger.debug(doc.getAsPrettyString());
}
int dim = 0;
if (srsDimension != null) {
@@ -1171,32 +1170,32 @@
if (srsName == null) {
if (srsDimension != null) {
- throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.attribute-srsdimension-cannot-be-defined-unless-attribute-srsname-has-been-defined")
+ "."); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.attribute-srsdimension-cannot-be-defined-unless-attribute-srsname-has-been-defined")
+ ".");
}
if (axisLabels != null) {
- throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.attribute-axislabels-cannot-be-defined-unless-attribute-srsname-has-been-defined")
+ "."); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.attribute-axislabels-cannot-be-defined-unless-attribute-srsname-has-been-defined")
+ ".");
}
}
if (axisLabels == null) {
if (uomLabels != null) {
- throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.attribute-uomlabels-cannot-be-defined-unless-attribute-axisLabels-has-been-defined")
+ "."); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.attribute-uomlabels-cannot-be-defined-unless-attribute-axisLabels-has-been-defined")
+ ".");
}
}
String tmp = XMLTools.getStringValue(element);
double[] values = StringTools.toArrayDouble(tmp, "\t\n\r\f ,");
int size = values.length / dim;
-
LOG.logDebug(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.number-of-points")
+ " = ", size); //$NON-NLS-1$ //$NON-NLS-2$
-
LOG.logDebug(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.size-of-the-original-array")
+ ": ", values.length); //$NON-NLS-1$ //$NON-NLS-2$
-
LOG.logDebug(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.dimension")
+ ": ", dim); //$NON-NLS-1$ //$NON-NLS-2$
+
Logger.debug(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.number-of-points")
+ " = "+ size);
+
Logger.debug(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.size-of-the-original-array")
+ ": "+ values.length);
+
Logger.debug(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.dimension")
+ ": "+ dim);
if (values.length < 4) {
- throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.a-point-list-must-have-minimum-two-coordinate-tuples")
//$NON-NLS-1$
- + ". " //$NON-NLS-1$
- +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.here-only")
//$NON-NLS-1$
- + " '" //$NON-NLS-1$
- + size + "' " //$NON-NLS-1$
- +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.are-defined")
//$NON-NLS-1$
+ throw new
InvalidGMLException(I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.a-point-list-must-have-minimum-two-coordinate-tuples")
+ + ". "
+ +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.here-only")
+ + " '"
+ + size + "' "
+ +
I18N.getString("org.deegree.model.spatialschema.GMLGeometryAdapter.are-defined")
+ ".");
}
double positions[][] = new double[size][dim];
@@ -1378,7 +1377,7 @@
String srs = null;
if (crs != null) {
- srs = "<gml:Envelope srsName=\"" + crs + "\""; //$NON-NLS-1$
//$NON-NLS-2$
+ srs = "<gml:Envelope srsName=\"" + crs + "\"";
} else {
srs = "<gml:Envelope";
}
@@ -1452,14 +1451,14 @@
}
String srs = null;
if (crs != null) {
- srs = "<gml:Point srsName=\"" + crs + "\">"; //$NON-NLS-1$
//$NON-NLS-2$
+ srs = "<gml:Point srsName=\"" + crs + "\">";
} else {
srs = "<gml:Point>";
}
pw.println(srs);
if (dim != 0) {
- String dimension = "<gml:pos srsDimension=\"" + dim + "\">";
//$NON-NLS-1$ //$NON-NLS-2$
+ String dimension = "<gml:pos srsDimension=\"" + dim + "\">";
pw.print(dimension);
} else {
pw.print("<gml:pos>");
@@ -1490,7 +1489,7 @@
}
String srs = null;
if (crs != null) {
- srs = "<gml:Curve srsName=\"" + crs + "\">"; //$NON-NLS-1$
//$NON-NLS-2$
+ srs = "<gml:Curve srsName=\"" + crs + "\">";
} else {
srs = "<gml:Curve>";
}
@@ -1554,7 +1553,7 @@
String srs = null;
if (crs != null) {
- srs = "<gml:Surface srsName='" + crs + "'>"; //$NON-NLS-1$
//$NON-NLS-2$
+ srs = "<gml:Surface srsName='" + crs + "'>";
} else {
srs = "<gml:Surface>";
}
@@ -1618,7 +1617,7 @@
String formatType ) {
// exterior ring
if (formatType.contains(GML2_FORMAT_TYPE)) {
- pw.print("<gml:outerBoundaryIs>"); //$NON-NLS-1$
+ pw.print("<gml:outerBoundaryIs>");
} else {
pw.print("<gml:exterior>");
}
@@ -1634,7 +1633,7 @@
}
pw.print("</gml:LinearRing>");
if (formatType.contains(GML2_FORMAT_TYPE)) {
- pw.print("</gml:outerBoundaryIs>"); //$NON-NLS-1$
+ pw.print("</gml:outerBoundaryIs>");
} else {
pw.print("</gml:exterior>");
}
@@ -1678,20 +1677,20 @@
*/
private static void printPositions( PrintWriter pw, Position[] p, int
coordinateDimension,
String formatType ) {
- String startTag = formatType.equals(GML2_FORMAT_TYPE) ?
"<gml:coordinates" : "<gml:posList"; //$NON-NLS-1$ //$NON-NLS-2$
+ String startTag = formatType.equals(GML2_FORMAT_TYPE) ?
"<gml:coordinates" : "<gml:posList";
String endTag =
- formatType.equals(GML2_FORMAT_TYPE) ? "</gml:coordinates>" :
"</gml:posList>"; //$NON-NLS-1$ //$NON-NLS-2$
+ formatType.equals(GML2_FORMAT_TYPE) ? "</gml:coordinates>" :
"</gml:posList>";
StringBuilder posList = new StringBuilder(startTag);
- String coordSeparator = formatType.equals(GML2_FORMAT_TYPE) ? "," : "
"; //$NON-NLS-1$ //$NON-NLS-2$
+ String coordSeparator = formatType.equals(GML2_FORMAT_TYPE) ? "," : "
";
if (formatType.equals(GML2_FORMAT_TYPE)) {
posList.append(" decimal=\".\" cs=\",\" ts=\" \"");
} else {
if (coordinateDimension > 0) {
- posList.append("
srsDimension='").append(coordinateDimension).append("'"); //$NON-NLS-1$
//$NON-NLS-2$
+ posList.append("
srsDimension='").append(coordinateDimension).append("'");
}
- posList.append(" count='").append(p.length).append("'");
//$NON-NLS-1$ //$NON-NLS-2$
+ posList.append(" count='").append(p.length).append("'");
}
posList.append(">");
@@ -1700,7 +1699,7 @@
for( int j = 0; j < (p.length - 1); j++ ) {
pw.print(p[j].getX() + coordSeparator + p[j].getY());
if (coordinateDimension == 3) {
- pw.print(coordSeparator + p[j].getZ() + " "); //$NON-NLS-1$
//$NON-NLS-2$
+ pw.print(coordSeparator + p[j].getZ() + " ");
} else {
pw.print(' ');
}
@@ -1725,7 +1724,7 @@
}
String srs = null;
if (crs != null) {
- srs = "<gml:MultiPoint srsName=\"" + crs + "\">"; //$NON-NLS-1$
//$NON-NLS-2$
+ srs = "<gml:MultiPoint srsName=\"" + crs + "\">";
} else {
srs = "<gml:MultiPoint>";
}
@@ -1762,7 +1761,7 @@
}
String srs = null;
if (crs != null) {
- srs = "<gml:MultiCurve srsName=\"" + crs + "\">"; //$NON-NLS-1$
//$NON-NLS-2$
+ srs = "<gml:MultiCurve srsName=\"" + crs + "\">";
} else {
srs = "<gml:MultiCurve>";
}
@@ -1783,7 +1782,7 @@
for( int k = 0; k < (p.length - 1); k++ ) {
pw.print(p[k].getX() + " " + p[k].getY());
if (curve.getCoordinateDimension() == 3) {
- pw.print(" " + p[k].getZ() + " "); //$NON-NLS-1$
//$NON-NLS-2$
+ pw.print(" " + p[k].getZ() + " ");
} else {
pw.print(" ");
}
@@ -1818,7 +1817,7 @@
}
String srs = null;
if (crs != null) {
- srs = "<gml:MultiSurface srsName=\"" + crs + "\">"; //$NON-NLS-1$
//$NON-NLS-2$
+ srs = "<gml:MultiSurface srsName=\"" + crs + "\">";
} else {
srs = "<gml:MultiSurface>";
}
Modified: core/trunk/src/org/deegree/model/spatialschema/JTSAdapter.java
===================================================================
--- core/trunk/src/org/deegree/model/spatialschema/JTSAdapter.java
2016-01-10 18:45:58 UTC (rev 4767)
+++ core/trunk/src/org/deegree/model/spatialschema/JTSAdapter.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -42,11 +42,10 @@
---------------------------------------------------------------------------*/
package org.deegree.model.spatialschema;
-import org.deegree.framework.log.ILogger;
-import org.deegree.framework.log.LoggerFactory;
import org.deegree.model.crs.CoordinateSystem;
import com.vividsolutions.jts.geom.PrecisionModel;
+import com.vividsolutions.jump.workbench.Logger;
/**
* Adapter between deegree-<tt>Geometry</tt>s and JTS-<tt>Geometry<tt> objects.
@@ -62,8 +61,6 @@
*/
public class JTSAdapter {
- private static final ILogger LOG =
LoggerFactory.getLogger(JTSAdapter.class);
-
// precision model that is used for all JTS-Geometries
private static PrecisionModel pm = new PrecisionModel();
@@ -270,7 +267,7 @@
try {
patch = surface.getSurfacePatchAt(0);
} catch (GeometryException e) {
- LOG.logError("", e);
+ Logger.error(e);
}
Position[] exteriorRing = patch.getExteriorRing();
Position[][] interiorRings = patch.getInteriorRings();
Modified: core/trunk/src/org/openide/awt/DropDownButton.java
===================================================================
--- core/trunk/src/org/openide/awt/DropDownButton.java 2016-01-10 18:45:58 UTC
(rev 4767)
+++ core/trunk/src/org/openide/awt/DropDownButton.java 2016-01-10 18:47:43 UTC
(rev 4768)
@@ -52,8 +52,7 @@
import java.beans.PropertyChangeListener;
import java.util.HashMap;
import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
import javax.swing.DefaultButtonModel;
import javax.swing.Icon;
import javax.swing.JButton;
@@ -61,6 +60,8 @@
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
+import com.vividsolutions.jump.workbench.Logger;
+
/**
* JButton with a small arrow that displays popup menu when clicked.
*
@@ -345,7 +346,7 @@
@Override
public void setText( String text ) {
//does nothing
-
Logger.getLogger(DropDownToggleButton.class.getName()).log(Level.FINER,
"DropDownButton cannot display text."); //NOI18N
+ Logger.debug("DropDownButton cannot display text.");
}
@Override
Modified: core/trunk/src/org/openide/awt/DropDownToggleButton.java
===================================================================
--- core/trunk/src/org/openide/awt/DropDownToggleButton.java 2016-01-10
18:45:58 UTC (rev 4767)
+++ core/trunk/src/org/openide/awt/DropDownToggleButton.java 2016-01-10
18:47:43 UTC (rev 4768)
@@ -52,14 +52,15 @@
import java.beans.PropertyChangeListener;
import java.util.HashMap;
import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
import javax.swing.Icon;
import javax.swing.JPopupMenu;
import javax.swing.JToggleButton;
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
+import com.vividsolutions.jump.workbench.Logger;
+
/**
* JToggleButton with a small arrow that displays popup menu when clicked.
*
@@ -341,7 +342,7 @@
@Override
public void setText( String text ) {
//does nothing
-
Logger.getLogger(DropDownToggleButton.class.getName()).log(Level.FINER,
"DropDownToggleButton cannot display text."); //NOI18N
+ Logger.debug("DropDownToggleButton cannot display text.");
}
@Override
Modified: core/trunk/src/org/openjump/core/rasterimage/RasterImageLayer.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/RasterImageLayer.java
2016-01-10 18:45:58 UTC (rev 4767)
+++ core/trunk/src/org/openjump/core/rasterimage/RasterImageLayer.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -9,9 +9,34 @@
*/
package org.openjump.core.rasterimage;
-import com.vividsolutions.jts.geom.*;
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.geom.NoninvertibleTransformException;
+import java.awt.geom.Point2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.awt.image.IndexColorModel;
+import java.awt.image.Raster;
+import java.awt.image.renderable.ParameterBlock;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.UUID;
+
+import javax.media.jai.JAI;
+
+import org.openjump.util.metaData.MetaDataMap;
+import org.openjump.util.metaData.ObjectContainingMetaInformation;
+
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.Envelope;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.Polygon;
import com.vividsolutions.jump.util.Blackboard;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.AbstractLayerable;
import com.vividsolutions.jump.workbench.model.LayerManager;
@@ -20,22 +45,7 @@
import com.vividsolutions.jump.workbench.ui.LayerNameRenderer;
import com.vividsolutions.jump.workbench.ui.LayerViewPanel;
import com.vividsolutions.jump.workbench.ui.Viewport;
-import org.openjump.util.metaData.MetaDataMap;
-import org.openjump.util.metaData.ObjectContainingMetaInformation;
-import javax.media.jai.JAI;
-import java.awt.*;
-import java.awt.Point;
-import java.awt.geom.NoninvertibleTransformException;
-import java.awt.geom.Point2D;
-import java.awt.image.*;
-import java.awt.image.renderable.ParameterBlock;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.UUID;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
/**
* Layer representing a georeferenced raster image (e.g. an areal photography)
in OpenJump.
*
@@ -256,21 +266,21 @@
try {
raster = new RasterImageLayer(getName(), getLayerManager(),
getImageForDisplay(), getRasterData(null), new
Envelope(getWholeImageEnvelope()));
} catch (IOException ex) {
-
Logger.getLogger(RasterImageLayer.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.error(ex);
} catch (NoninvertibleTransformException ex) {
-
Logger.getLogger(RasterImageLayer.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.error(ex);
} catch (Exception ex) {
-
Logger.getLogger(RasterImageLayer.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.error(ex);
}
} else {
try {
raster = new RasterImageLayer(getName(), getLayerManager(),
getImageFileName(), getImageForDisplay(), new
Envelope(getWholeImageEnvelope()));
} catch (IOException ex) {
-
Logger.getLogger(RasterImageLayer.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.error(ex);
} catch (NoninvertibleTransformException ex) {
-
Logger.getLogger(RasterImageLayer.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.error(ex);
} catch (Exception ex) {
-
Logger.getLogger(RasterImageLayer.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.error(ex);
}
}
// clone must produce a layerable with the same name (as for Layer)
not a unique name
Modified:
core/trunk/src/org/openjump/core/rasterimage/styler/ui/CustomGradientColorsDialog.java
===================================================================
---
core/trunk/src/org/openjump/core/rasterimage/styler/ui/CustomGradientColorsDialog.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/rasterimage/styler/ui/CustomGradientColorsDialog.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -1,11 +1,12 @@
package org.openjump.core.rasterimage.styler.ui;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.swing.JOptionPane;
+
import org.openjump.core.rasterimage.styler.ColorMapEntry;
import org.openjump.core.rasterimage.styler.RasterStylesExtension;
+import com.vividsolutions.jump.workbench.Logger;
+
/**
*
* @author GeomaticaEAmbiente
@@ -187,7 +188,7 @@
try {
okButton();
} catch (Exception ex) {
-
Logger.getLogger(org.openjump.core.rasterimage.styler.ui.CustomGradientColorsDialog.class.getName()).log(Level.SEVERE,
null, ex);
+ Logger.error(ex);
}
Modified:
core/trunk/src/org/openjump/core/rasterimage/styler/ui/GradientTablePanel.java
===================================================================
---
core/trunk/src/org/openjump/core/rasterimage/styler/ui/GradientTablePanel.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/rasterimage/styler/ui/GradientTablePanel.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -4,16 +4,18 @@
import java.awt.Component;
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import javax.swing.table.DefaultTableModel;
+
import org.openjump.core.rasterimage.styler.ColorMapEntry;
import org.openjump.core.rasterimage.styler.ColorUtils;
+import com.vividsolutions.jump.workbench.Logger;
+
/**
*
* @author GeomaticaEAmbiente
@@ -102,7 +104,7 @@
}catch(Exception ex){
updateGradient = true;
-
Logger.getLogger(org.openjump.core.rasterimage.styler.ui.GradientTablePanel.class.getName()).log(Level.SEVERE,
null, ex);
+ Logger.error(ex);
}
updateGradient = true;
Modified:
core/trunk/src/org/openjump/core/rasterimage/styler/ui/IntervalPanel.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/styler/ui/IntervalPanel.java
2016-01-10 18:45:58 UTC (rev 4767)
+++ core/trunk/src/org/openjump/core/rasterimage/styler/ui/IntervalPanel.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -1,8 +1,5 @@
package org.openjump.core.rasterimage.styler.ui;
-import org.openjump.core.rasterimage.styler.ColorUtils;
-import org.openjump.core.rasterimage.styler.RasterStylesExtension;
-import com.vividsolutions.jump.util.Range;
import java.awt.Color;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -14,17 +11,22 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
import javax.swing.JOptionPane;
+
import org.openjump.core.attributeoperations.Classifier1D;
import org.openjump.core.rasterimage.RasterImageLayer;
+import org.openjump.core.rasterimage.RasterSymbology;
import org.openjump.core.rasterimage.styler.ColorMapEntry;
-import org.openjump.core.rasterimage.RasterSymbology;
-import org.openjump.core.rasterimage.styler.ui.ColorsTablePanel.TableType;
+import org.openjump.core.rasterimage.styler.ColorUtils;
import org.openjump.core.rasterimage.styler.RasterClassifier1D;
+import org.openjump.core.rasterimage.styler.RasterStylesExtension;
import org.openjump.core.rasterimage.styler.Utils;
+import org.openjump.core.rasterimage.styler.ui.ColorsTablePanel.TableType;
+import com.vividsolutions.jump.util.Range;
+import com.vividsolutions.jump.workbench.Logger;
+
/**
*
* @author GeomaticaEAmbiente
@@ -178,7 +180,7 @@
try {
rampAll();
} catch (Exception ex) {
- Logger.getLogger(IntervalPanel.class.getName()).log(Level.SEVERE,
null, ex);
+ Logger.error(ex);
}
}//GEN-LAST:event_jButton_ValuesActionPerformed
@@ -194,7 +196,7 @@
try {
rampColors();
} catch (Exception ex) {
- Logger.getLogger(IntervalPanel.class.getName()).log(Level.SEVERE,
null, ex);
+ Logger.error(ex);
}
}//GEN-LAST:event_jButton_RampActionPerformed
@@ -209,7 +211,7 @@
try {
rampAll();
} catch (Exception ex) {
-
Logger.getLogger(IntervalPanel.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.error(ex);
}
}
Modified:
core/trunk/src/org/openjump/core/rasterimage/styler/ui/RasterStylesDialog.java
===================================================================
---
core/trunk/src/org/openjump/core/rasterimage/styler/ui/RasterStylesDialog.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/rasterimage/styler/ui/RasterStylesDialog.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -1,23 +1,17 @@
package org.openjump.core.rasterimage.styler.ui;
-import com.vividsolutions.jump.util.Range;
-import com.vividsolutions.jump.util.StringUtil;
-import com.vividsolutions.jump.workbench.WorkbenchContext;
-import com.vividsolutions.jump.workbench.model.LayerEventType;
-import com.vividsolutions.jump.workbench.ui.ErrorDialog;
-import de.fho.jump.pirol.utilities.settings.PirolPlugInSettings;
import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.geom.NoninvertibleTransformException;
import java.io.File;
import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
import javax.swing.InputVerifier;
import javax.swing.JColorChooser;
import javax.swing.JComponent;
import javax.swing.JFileChooser;
+
import org.openjump.core.rasterimage.RasterImageLayer;
import org.openjump.core.rasterimage.RasterSymbology;
import org.openjump.core.rasterimage.Stats;
@@ -27,6 +21,15 @@
import org.openjump.core.ui.io.file.FileNameExtensionFilter;
import org.xml.sax.SAXException;
+import com.vividsolutions.jump.util.Range;
+import com.vividsolutions.jump.util.StringUtil;
+import com.vividsolutions.jump.workbench.Logger;
+import com.vividsolutions.jump.workbench.WorkbenchContext;
+import com.vividsolutions.jump.workbench.model.LayerEventType;
+import com.vividsolutions.jump.workbench.ui.ErrorDialog;
+
+import de.fho.jump.pirol.utilities.settings.PirolPlugInSettings;
+
/**
*
* @author GeomaticaEAmbiente
@@ -329,7 +332,7 @@
try {
updateRasterImageLayer();
} catch (Exception ex) {
-
Logger.getLogger(RasterStylesDialog.class.getName()).log(Level.SEVERE, null,
ex);
+ Logger.error(ex);
}
}//GEN-LAST:event_jButton_ApplyActionPerformed
@@ -345,7 +348,7 @@
try {
restoreToOriginal();
} catch (Exception ex) {
-
Logger.getLogger(RasterStylesDialog.class.getName()).log(Level.SEVERE, null,
ex);
+ Logger.error(ex);
}
}//GEN-LAST:event_jButton_RestoreActionPerformed
@@ -357,7 +360,7 @@
updateRasterImageLayer();
closeDialog();
} catch (Exception ex) {
-
Logger.getLogger(RasterStylesDialog.class.getName()).log(Level.SEVERE, null,
ex);
+ Logger.error( ex);
}
}//GEN-LAST:event_jButton_OKActionPerformed
Modified:
core/trunk/src/org/openjump/core/rasterimage/styler/ui/SingleValuesPanel.java
===================================================================
---
core/trunk/src/org/openjump/core/rasterimage/styler/ui/SingleValuesPanel.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/rasterimage/styler/ui/SingleValuesPanel.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -7,15 +7,17 @@
import java.util.Iterator;
import java.util.Set;
import java.util.TreeSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
import javax.swing.JOptionPane;
-import org.openjump.core.rasterimage.styler.ColorMapEntry;
+
import org.openjump.core.rasterimage.RasterImageLayer;
import org.openjump.core.rasterimage.RasterSymbology;
+import org.openjump.core.rasterimage.styler.ColorMapEntry;
import org.openjump.core.rasterimage.styler.ColorUtils;
import org.openjump.core.rasterimage.styler.RasterStylesExtension;
+import com.vividsolutions.jump.workbench.Logger;
+
/**
*
* @author GeomaticaEAmbiente
@@ -128,7 +130,7 @@
try {
rampAll(false);
} catch (Exception ex) {
-
Logger.getLogger(SingleValuesPanel.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.error(ex);
}
}//GEN-LAST:event_jButton_RampActionPerformed
@@ -136,7 +138,7 @@
try {
rampAll(true);
} catch (Exception ex) {
-
Logger.getLogger(SingleValuesPanel.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.error(ex);
}
}//GEN-LAST:event_jButton_RandomActionPerformed
@@ -148,7 +150,7 @@
findUniqueValues();
rampAll(true);
} catch (Exception ex) {
-
Logger.getLogger(SingleValuesPanel.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.error(ex);
}
}
@@ -158,7 +160,7 @@
try {
rampColors();
} catch (Exception ex) {
-
Logger.getLogger(SingleValuesPanel.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.error(ex);
}
}//GEN-LAST:event_jButton1ActionPerformed
Modified:
core/trunk/src/org/openjump/core/ui/plugin/customize/PythonToolsPlugIn.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/customize/PythonToolsPlugIn.java
2016-01-10 18:45:58 UTC (rev 4767)
+++ core/trunk/src/org/openjump/core/ui/plugin/customize/PythonToolsPlugIn.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -44,7 +44,7 @@
import javax.swing.JMenu;
import javax.swing.JMenuBar;
-import org.apache.log4j.Logger;
+
import org.openjump.util.python.JUMP_GIS_Framework;
import org.openjump.util.python.ModifyGeometry;
import org.openjump.util.python.PythonInteractiveInterpreter;
@@ -65,7 +65,7 @@
import com.vividsolutions.jump.workbench.ui.toolbox.ToolboxPlugIn;
public class PythonToolsPlugIn extends ToolboxPlugIn {
- private static final Logger LOG = Logger.getLogger(PythonToolsPlugIn.class);
+
private static String sName = "Python Console and Tools";
private static final ImageIcon icon = IconLoader
.icon("famfam/application_python.png");
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/AddWritableDataStoreLayerWizard.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/AddWritableDataStoreLayerWizard.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/AddWritableDataStoreLayerWizard.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -1,5 +1,15 @@
package org.openjump.core.ui.plugin.datastore;
+import java.awt.Color;
+import java.util.Collection;
+
+import javax.swing.SwingUtilities;
+
+import org.openjump.core.ccordsys.srid.SRIDStyle;
+import
org.openjump.core.ui.plugin.datastore.transaction.DataStoreTransactionManager;
+import org.openjump.core.ui.plugin.file.open.ChooseProjectPanel;
+import org.openjump.core.ui.swing.wizard.AbstractWizardGroup;
+
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.coordsys.CoordinateSystemRegistry;
import com.vividsolutions.jump.feature.FeatureCollection;
@@ -7,6 +17,7 @@
import com.vividsolutions.jump.io.datasource.DataSource;
import com.vividsolutions.jump.io.datasource.DataSourceQuery;
import com.vividsolutions.jump.task.TaskMonitor;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.datastore.ConnectionDescriptor;
import com.vividsolutions.jump.workbench.model.Category;
@@ -16,23 +27,13 @@
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
import com.vividsolutions.jump.workbench.ui.plugin.AddNewLayerPlugIn;
import com.vividsolutions.jump.workbench.ui.wizard.WizardDialog;
-import org.apache.log4j.Logger;
-import org.openjump.core.ccordsys.srid.SRIDStyle;
-import
org.openjump.core.ui.plugin.datastore.postgis2.PostGISDataStoreDataSource;
-import
org.openjump.core.ui.plugin.datastore.transaction.DataStoreTransactionManager;
-import org.openjump.core.ui.plugin.file.open.ChooseProjectPanel;
-import org.openjump.core.ui.swing.wizard.AbstractWizardGroup;
-import javax.swing.*;
-import java.awt.*;
-import java.util.Collection;
-
/**
* Add a wizard to the Open dialog to open database connections with
read/write capability.
*/
public class AddWritableDataStoreLayerWizard extends AbstractWizardGroup {
- final Logger LOG = Logger.getLogger(AddWritableDataStoreLayerWizard.class);
+
private static final String KEY =
AddWritableDataStoreLayerWizard.class.getName();
private AddWritableDataStoreLayerWizardPanel dataStoreWizardPanel;
@@ -140,13 +141,13 @@
sridStyle.setSRID(panel.getGeometryColumn().getSRID());
layer.addStyle(sridStyle);
- LOG.info("Add layer '" + layer.getName() + "' to '" +
layerManager.getTask().getName() + "' using WritableDataStoreDataSource with
:");
- LOG.info(" geometry column = " + geometryAttributeName);
- LOG.info(" srid = " + sridStyle.getSRID());
- LOG.info(" external PK column = " + identifierAttributeName);
- LOG.info(" max features = " + limit);
- LOG.info(" where clause = " + whereClause);
- LOG.info(" limit to view = " + limitedToView);
+ Logger.info("Add layer '" + layer.getName() + "' to '" +
layerManager.getTask().getName() + "' using WritableDataStoreDataSource with
:");
+ Logger.info(" geometry column = " + geometryAttributeName);
+ Logger.info(" srid = " + sridStyle.getSRID());
+ Logger.info(" external PK column = " + identifierAttributeName);
+ Logger.info(" max features = " + limit);
+ Logger.info(" where clause = " + whereClause);
+ Logger.info(" limit to view = " + limitedToView);
layerManager.setFiringEvents(true); // added by michaudm on
2009-04-05
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/WritableDataStoreDataSource.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -18,7 +18,6 @@
import javax.swing.JOptionPane;
-import org.apache.log4j.Logger;
import org.openjump.core.ui.plugin.datastore.postgis.PostGISConnectionUtil;
import org.openjump.core.ui.plugin.datastore.postgis.PostGISQueryUtil;
import
org.openjump.core.ui.plugin.datastore.transaction.DataStoreTransactionManager;
@@ -38,6 +37,7 @@
import com.vividsolutions.jump.task.TaskMonitor;
import com.vividsolutions.jump.util.CollectionUtil;
import com.vividsolutions.jump.workbench.JUMPWorkbench;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.datastore.ConnectionDescriptor;
import com.vividsolutions.jump.workbench.model.Layer;
import
com.vividsolutions.jump.workbench.ui.plugin.datastore.DataStoreDataSource;
@@ -48,8 +48,8 @@
public abstract class WritableDataStoreDataSource extends DataStoreDataSource {
private static final String KEY =
WritableDataStoreDataSource.class.getName();
- Logger LOG = Logger.getLogger(WritableDataStoreDataSource.class);
+
// Inherited from DataStoreDataSource (query)
// DATASET_NAME_KEY
// GEOMETRY_ATTRIBUTE_NAME_KEY
@@ -203,7 +203,7 @@
try {
conn.setAutoCommit(false);
if (!tableAlreadyCreated) {
- LOG.debug("Update mode: create table");
+ Logger.debug("Update mode: create table");
boolean exists = tableExists(conn);
if (exists && !confirmOverwrite()) return;
if (exists) {
@@ -229,7 +229,7 @@
tableAlreadyCreated = true;
}
else {
- LOG.debug("Update mode: update table");
+ Logger.debug("Update mode: update table");
primaryKeyName =
(String)getProperties().get(EXTERNAL_PK_KEY);
FeatureSchema featureSchema =
featureCollection.getFeatureSchema();
PostGISConnectionUtil connUtil = new
PostGISConnectionUtil(conn);
@@ -269,17 +269,17 @@
private void commit(java.sql.Connection conn,
int srid, int dim, boolean normalizedColumnNames) throws
Exception {
- LOG.info("Evolutions to commit to " + schemaName + "." + tableName + "
(PK=" + primaryKeyName +")");
+ Logger.info("Evolutions to commit to " + schemaName + "." + tableName
+ " (PK=" + primaryKeyName +")");
for (Evolution evolution : evolutions.values()) {
if (evolution.getType() == Evolution.Type.CREATION) {
PreparedStatement pstmt = insertStatement(conn,
evolution.getNewFeature().getSchema(),
normalizedColumnNames);
pstmt = setAttributeValues(pstmt, evolution.getNewFeature(),
srid, dim, primaryKeyName);
pstmt.execute();
- LOG.info(" create new feature " +
evolution.getNewFeature().getID()+"/");
+ Logger.info(" create new feature " +
evolution.getNewFeature().getID()+"/");
} else if (evolution.getType() == Evolution.Type.SUPPRESSION) {
deleteStatement(conn,
evolution.getOldFeature()).executeUpdate();
- LOG.info(" delete " + evolution.getOldFeature().getID() + "/"
+
+ Logger.info(" delete " + evolution.getOldFeature().getID() +
"/" +
evolution.getOldFeature().getAttribute(primaryKeyName));
} else if (evolution.getType() == Evolution.Type.MODIFICATION) {
Feature oldFeature = evolution.getOldFeature();
@@ -294,7 +294,7 @@
updateOneAttributeStatement(conn, newFeature, i, srid,
dim).executeUpdate();
}
}
- LOG.info(" modify " + evolution.getNewFeature().getID() + "/"
+
+ Logger.info(" modify " + evolution.getNewFeature().getID() +
"/" +
evolution.getNewFeature().getAttribute(primaryKeyName));
}
}
@@ -353,14 +353,14 @@
else if (type == AttributeType.DATE) pstmt.setTimestamp(1, new
Timestamp(((Date) feature.getAttribute(attribute)).getTime()));
else if (type == AttributeType.OBJECT) pstmt.setObject(1,
feature.getAttribute(attribute));
else throw new IllegalArgumentException(type + " is an unknown
AttributeType !");
- LOG.debug(pstmt);
+ Logger.debug(pstmt.toString());
return pstmt;
}
private PreparedStatement deleteStatement(java.sql.Connection conn,
Feature feature) throws SQLException {
PreparedStatement pstmt = conn.prepareStatement("DELETE FROM " +
compose(schemaName, tableName) + " WHERE \"" + primaryKeyName + "\" = ?");
pstmt.setObject(1,feature.getAttribute(primaryKeyName));
- LOG.debug(pstmt);
+ Logger.debug(pstmt.toString());
return pstmt;
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis2/PostGISDataStoreDataSource.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis2/PostGISDataStoreDataSource.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/postgis2/PostGISDataStoreDataSource.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -1,37 +1,38 @@
package org.openjump.core.ui.plugin.datastore.postgis2;
+import static
org.openjump.core.ui.plugin.datastore.postgis.PostGISQueryUtil.compose;
+import static
org.openjump.core.ui.plugin.datastore.postgis.PostGISQueryUtil.normalize;
+import static
org.openjump.core.ui.plugin.datastore.postgis.PostGISQueryUtil.unquote;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Iterator;
+
+import org.openjump.core.ui.plugin.datastore.WritableDataStoreDataSource;
+import org.openjump.core.ui.plugin.datastore.postgis.PostGISQueryUtil;
+
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jump.datastore.AdhocQuery;
import com.vividsolutions.jump.datastore.postgis.PostgisDSConnection;
+import com.vividsolutions.jump.datastore.postgis.PostgisDSDriver;
import com.vividsolutions.jump.datastore.postgis.PostgisDSMetadata;
-import com.vividsolutions.jump.datastore.postgis.PostgisDSDriver;
import com.vividsolutions.jump.feature.Feature;
import com.vividsolutions.jump.feature.FeatureCollection;
import com.vividsolutions.jump.feature.FeatureDataset;
import com.vividsolutions.jump.feature.FeatureSchema;
import com.vividsolutions.jump.io.FeatureInputStream;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.datastore.ConnectionDescriptor;
-import org.apache.log4j.Logger;
-import org.openjump.core.ui.plugin.datastore.WritableDataStoreDataSource;
-import org.openjump.core.ui.plugin.datastore.postgis.PostGISQueryUtil;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Iterator;
-
-import static
org.openjump.core.ui.plugin.datastore.postgis.PostGISQueryUtil.compose;
-import static
org.openjump.core.ui.plugin.datastore.postgis.PostGISQueryUtil.normalize;
-import static
org.openjump.core.ui.plugin.datastore.postgis.PostGISQueryUtil.unquote;
-
/**
* A {@link WritableDataStoreDataSource} for PostGIS.
*/
public class PostGISDataStoreDataSource extends WritableDataStoreDataSource {
- Logger LOG = Logger.getLogger(WritableDataStoreDataSource.class);
+
public PostGISDataStoreDataSource() {
// Called by Java2XML [Jon Aquino 2005-03-16]
}
@@ -53,12 +54,12 @@
public void finalizeUpdate(Connection conn) throws Exception {
conn.createStatement().execute("VACUUM ANALYZE " +
PostGISQueryUtil.compose(schemaName,
tableName));
- LOG.debug("VACUUM ANALYZE " + PostGISQueryUtil.compose(schemaName,
tableName));
+ Logger.debug("VACUUM ANALYZE " + PostGISQueryUtil.compose(schemaName,
tableName));
}
protected FeatureCollection createFeatureCollection() throws Exception {
- LOG.debug("Create new FeatureCollection from " +
getProperties().get(DATASET_NAME_KEY));
+ Logger.debug("Create new FeatureCollection from " +
getProperties().get(DATASET_NAME_KEY));
//String[] datasetName =
PostGISQueryUtil.splitTableName((String)getProperties().get(DATASET_NAME_KEY));
//schemaName = datasetName[0];
//tableName = datasetName[1];
@@ -72,7 +73,7 @@
boolean hasPK = getProperties().get(EXTERNAL_PK_KEY) != null;
String PK = (String)getProperties().get(EXTERNAL_PK_KEY);
String query = buildQueryString(pgConnection);
- LOG.debug(query);
+ Logger.debug(query);
// Create the adhoc query corresponding to this datasource
AdhocQuery adhocQuery = new AdhocQuery(query);
@@ -253,7 +254,7 @@
String sql = schemaName == null ?
"SELECT Find_SRID('public', '" + tableName + "', '" +
unquote(column) + "');" :
"SELECT Find_SRID('" + schemaName + "', '" + tableName + "',
'" + unquote(column) + "');";
- LOG.debug(sql);
+ Logger.debug(sql);
ResultSet rs = conn.prepareStatement(sql).executeQuery();
if (rs.next()) return rs.getInt(1);
else return 0;
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManager.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManager.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManager.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -1,18 +1,31 @@
package org.openjump.core.ui.plugin.datastore.transaction;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import org.openjump.core.ui.plugin.datastore.WritableDataStoreDataSource;
+
import com.vividsolutions.jump.feature.Feature;
import com.vividsolutions.jump.feature.FeatureCollection;
import com.vividsolutions.jump.feature.FeatureDataset;
import com.vividsolutions.jump.io.datasource.DataSource;
import com.vividsolutions.jump.task.DummyTaskMonitor;
import com.vividsolutions.jump.workbench.JUMPWorkbench;
-import com.vividsolutions.jump.workbench.model.*;
+import com.vividsolutions.jump.workbench.Logger;
+import com.vividsolutions.jump.workbench.model.FeatureEvent;
+import com.vividsolutions.jump.workbench.model.FeatureEventType;
+import com.vividsolutions.jump.workbench.model.Layer;
+import com.vividsolutions.jump.workbench.model.LayerAdapter;
+import com.vividsolutions.jump.workbench.model.LayerEvent;
+import com.vividsolutions.jump.workbench.model.LayerEventType;
+import com.vividsolutions.jump.workbench.model.LayerListener;
+import com.vividsolutions.jump.workbench.model.Task;
import com.vividsolutions.jump.workbench.ui.TaskFrame;
-import org.apache.log4j.Logger;
-import org.openjump.core.ui.plugin.datastore.WritableDataStoreDataSource;
-import java.util.*;
-
/**
* Central class to manage datastore transactions from OpenJUMP.
* There is only one DataStoreTransactionManager (singleton) for the whole
Workbench.
@@ -23,7 +36,7 @@
*/
public class DataStoreTransactionManager {
- final Logger LOG = Logger.getLogger(DataStoreTransactionManager.class);
+
final String KEY = DataStoreTransactionManager.class.getName();
private static DataStoreTransactionManager TXMANAGER = new
DataStoreTransactionManager();
@@ -52,7 +65,7 @@
registeredListeners.put(task,listener);
}
registeredLayers.put(layer, task);
- LOG.info("Register layer '" + layer.getName() + "' (" + task.getName()
+ ") in the DataStoreTransactionManager");
+ Logger.info("Register layer '" + layer.getName() + "' (" +
task.getName() + ") in the DataStoreTransactionManager");
}
private boolean containsLayerManager(Task task) {
@@ -70,20 +83,20 @@
if (e.getType() == FeatureEventType.ADDED) {
for (Object feature : e.getFeatures()) {
try {
- LOG.debug("FeatureEventType: ADDED " +
((Feature)feature).getID());
+ Logger.debug("FeatureEventType: ADDED " +
((Feature)feature).getID());
source.addCreation((Feature)feature);
} catch (EvolutionOperationException ex) {
- LOG.error("Error during creation of
feature " + ((Feature)feature).getID(), ex);
+ Logger.error("Error during creation of
feature " + ((Feature)feature).getID(), ex);
}
}
}
else if (e.getType() == FeatureEventType.DELETED) {
for (Object feature : e.getFeatures()) {
try {
- LOG.debug("FeatureEventType: DELETED " +
((Feature)feature).getID());
+ Logger.debug("FeatureEventType: DELETED "
+ ((Feature)feature).getID());
source.addSuppression((Feature)feature);
} catch (EvolutionOperationException ex) {
- LOG.error("Error during suppression of
feature " + ((Feature)feature).getID(), ex);
+ Logger.error("Error during suppression of
feature " + ((Feature)feature).getID(), ex);
}
}
}
@@ -93,10 +106,10 @@
Iterator oldFeatures =
e.getOldFeatureAttClones().iterator();
for (Object feature : e.getFeatures()) {
try {
- LOG.debug("FeatureEventType:
ATTRIBUTES_MODIFIED " + ((Feature)feature).getID());
+ Logger.debug("FeatureEventType:
ATTRIBUTES_MODIFIED " + ((Feature)feature).getID());
source.addModification((Feature)feature,
(Feature)oldFeatures.next());
} catch (EvolutionOperationException ex) {
- LOG.error("Error during modification of
feature " + ((Feature)feature).getID(), ex);
+ Logger.error("Error during modification of
feature " + ((Feature)feature).getID(), ex);
}
}
}
@@ -106,19 +119,19 @@
Iterator oldFeatures =
e.getOldFeatureClones().iterator();
for (Object feature : e.getFeatures()) {
try {
- LOG.debug("FeatureEventType:
GEOMETRY_MODIFIED " + ((Feature)feature).getID());
+ Logger.debug("FeatureEventType:
GEOMETRY_MODIFIED " + ((Feature)feature).getID());
source.addModification((Feature)feature,
(Feature)oldFeatures.next());
} catch (EvolutionOperationException ex) {
- LOG.error("Error during modification of
feature " + ((Feature)feature).getID(), ex);
+ Logger.error("Error during modification of
feature " + ((Feature)feature).getID(), ex);
}
}
}
else {
- LOG.error(e.getType() + " is an unknown
FeatureEventType");
+ Logger.error(e.getType() + " is an unknown
FeatureEventType");
}
}
else {
- LOG.error("DataStoreTransactionManager should never
contain a reference to a layer which does not use a
WritableDataStoreDataSource");
+ Logger.error("DataStoreTransactionManager should never
contain a reference to a layer which does not use a
WritableDataStoreDataSource");
}
}
}
@@ -130,7 +143,7 @@
}
}
registeredLayers.remove(e.getLayerable());
- LOG.info("Unregister layer " + e.getLayerable().getName()
+ " from the DataStoreTransactionManager");
+ Logger.info("Unregister layer " +
e.getLayerable().getName() + " from the DataStoreTransactionManager");
}
}
};
@@ -169,10 +182,10 @@
// (see also WritableDataStoreDataSource#reloadDataFromDataStore)
//source.getProperties().put(WritableDataStoreDataSource.CREATE_TABLE, false);
try {
- LOG.info("Commit layer \"" + layer.getName() + "\"");
+ Logger.info("Commit layer \"" + layer.getName() + "\"");
writableSource.getConnection().executeUpdate(null,layer.getFeatureCollectionWrapper(),
new DummyTaskMonitor());
} catch (Exception e) {
- LOG.error("Error occurred while comitting layer \"" +
layer.getName() + "\"", e);
+ Logger.error("Error occurred while comitting layer \"" +
layer.getName() + "\"", e);
throw e;
}
return true;
@@ -190,16 +203,16 @@
WritableDataStoreDataSource writableSource =
(WritableDataStoreDataSource)source;
int conflicts = 0;
try {
- LOG.info("Update layer \"" + layer.getName() + "\"");
+ Logger.info("Update layer \"" + layer.getName() + "\"");
FeatureCollection fc =
writableSource.getConnection().executeQuery(null, new DummyTaskMonitor());
conflicts = manageConflicts(taskFrame, layer, fc);
layer.getLayerManager().setFiringEvents(false);
layer.setFeatureCollection(fc);
- LOG.info("" + fc.size() + " features uploaded");
+ Logger.info("" + fc.size() + " features uploaded");
layer.getLayerManager().setFiringEvents(true);
- LOG.info("" + conflicts + " conflicts detected");
+ Logger.info("" + conflicts + " conflicts detected");
} catch (Exception e) {
- LOG.error("Error occurred while updating layer \"" +
layer.getName() + "\"", e);
+ Logger.error("Error occurred while updating layer \"" +
layer.getName() + "\"", e);
return -1;
}
return conflicts;
@@ -211,7 +224,7 @@
* Update all layers associated to a RWDataStoreDataSource.
*/
public void update(TaskFrame taskFrame) {
- LOG.info("Update project \"" + taskFrame.getTask().getName() + "\"");
+ Logger.info("Update project \"" + taskFrame.getTask().getName() +
"\"");
int total_conflicts = 0;
boolean no_error = true;
for (Layer layer : registeredLayers.keySet()) {
@@ -224,9 +237,9 @@
taskFrame.getLayerViewPanel().getSelectionManager().clear();
taskFrame.getLayerViewPanel().repaint();
if (no_error) {
- LOG.info("Project update finished with 0 error and " +
total_conflicts + " conflicts");
+ Logger.info("Project update finished with 0 error and " +
total_conflicts + " conflicts");
}
- else LOG.info("Project update finished with errors");
+ else Logger.info("Project update finished with errors");
}
private void inspect(TaskFrame taskFrame, Layer layer) {
@@ -262,7 +275,7 @@
else if (evolution.getType() == Evolution.Type.SUPPRESSION) {
layer_s.getFeatureCollectionWrapper().add(evolution.getOldFeature());
}
- else LOG.error("Tried to inspect an evolution which is neither
a creation nor a modification or a suppression");
+ else Logger.error("Tried to inspect an evolution which is
neither a creation nor a modification or a suppression");
}
}
}
@@ -281,15 +294,15 @@
public void commit() throws Exception {
TaskFrame activeFrame =
JUMPWorkbench.getInstance().getFrame().getActiveTaskFrame();
if (activeFrame == null) return;
- LOG.info("Commit evolutions on project \"" +
activeFrame.getTask().getName() + "\"");
+ Logger.info("Commit evolutions on project \"" +
activeFrame.getTask().getName() + "\"");
boolean no_error = true;
for (Layer layer : registeredLayers.keySet()) {
if
(activeFrame.getTask().getLayerManager().getLayers().contains(layer)) {
no_error = commit(layer) && no_error;
}
}
- if (no_error) LOG.info("Commit finished without error");
- else LOG.info("Commit finished with error");
+ if (no_error) Logger.info("Commit finished without error");
+ else Logger.info("Commit finished with error");
update(activeFrame);
}
@@ -324,9 +337,9 @@
// We must check if the remote change is the same as
the local change
// If different, we have a conflict and must decide
which one must be kept
if (!Arrays.equals(((Feature)
feature).getAttributes(), evo.getNewFeature().getAttributes())) {
- LOG.warn("Conflict detected for feature " +
evo.getNewFeature().getAttribute(pk));
- LOG.trace(" - Server: " + feature);
- LOG.trace(" - Local : " + evo.getNewFeature());
+ Logger.warn("Conflict detected for feature " +
evo.getNewFeature().getAttribute(pk));
+ Logger.trace(" - Server: " + feature);
+ Logger.trace(" - Local : " + evo.getNewFeature());
conflicts++;
if (manageConflicts) {
copyLocallyModifiedFeature(taskFrame, layer,
evo.getNewFeature());
@@ -336,25 +349,25 @@
// we can remove the change from the evolution table
else {
dataSource.removeEvolution(evo.getNewFeature().getID());
- LOG.trace("Eliminate an evolution from evolution
stack after detection of a false conflict: "
+ Logger.trace("Eliminate an evolution from
evolution stack after detection of a false conflict: "
+ evo.getNewFeature().getAttribute(pk));
}
}
else {
- LOG.trace("Database has not been changed since last
transaction : Keep local changes");
+ Logger.trace("Database has not been changed since last
transaction : Keep local changes");
((Feature)feature).setAttributes(evo.getNewFeature().getAttributes());
}
}
if (evo.getType()==Evolution.Type.SUPPRESSION) {
if (!Arrays.equals(((Feature) feature).getAttributes(),
evo.getOldFeature().getAttributes())) {
- LOG.warn("Conflict detected for feature " +
evo.getNewFeature().getAttribute(pk));
- LOG.trace(" - The feature has been locally deleted");
+ Logger.warn("Conflict detected for feature " +
evo.getNewFeature().getAttribute(pk));
+ Logger.trace(" - The feature has been locally
deleted");
conflicts++;
copyLocallyDeletedFeature(taskFrame, layer,
evo.getOldFeature());
}
// Database feature has not been changed : keep the local
change (delete it)
else {
- LOG.trace("Feature " + ((Feature)
feature).getAttribute(pk) + " has been locally deleted, don't update it again
!");
+ Logger.trace("Feature " + ((Feature)
feature).getAttribute(pk) + " has been locally deleted, don't update it again
!");
toBeDeleted.add(evo.getOldFeature());
}
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManagerPlugIn.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManagerPlugIn.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/DataStoreTransactionManagerPlugIn.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -1,31 +1,28 @@
package org.openjump.core.ui.plugin.datastore.transaction;
-import com.vividsolutions.jump.I18N;
+import java.awt.BorderLayout;
+
+import javax.swing.ImageIcon;
+import javax.swing.event.InternalFrameAdapter;
+import javax.swing.event.InternalFrameEvent;
+
+import org.openjump.core.model.TaskEvent;
+import org.openjump.core.model.TaskListener;
+import org.openjump.core.ui.plugin.datastore.WritableDataStoreDataSource;
+
import com.vividsolutions.jump.util.Blackboard;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.Layer;
import com.vividsolutions.jump.workbench.model.Task;
-import com.vividsolutions.jump.workbench.plugin.EnableCheck;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
import com.vividsolutions.jump.workbench.ui.GUIUtil;
-import com.vividsolutions.jump.workbench.ui.MenuNames;
import com.vividsolutions.jump.workbench.ui.TaskFrame;
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
-import com.vividsolutions.jump.workbench.ui.plugin.FeatureInstaller;
import com.vividsolutions.jump.workbench.ui.plugin.WorkbenchContextReference;
import com.vividsolutions.jump.workbench.ui.toolbox.ToolboxDialog;
import com.vividsolutions.jump.workbench.ui.toolbox.ToolboxPlugIn;
-import org.apache.log4j.Logger;
-import org.openjump.core.model.TaskEvent;
-import org.openjump.core.model.TaskListener;
-import org.openjump.core.ui.plugin.datastore.WritableDataStoreDataSource;
-import javax.swing.*;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.event.InternalFrameListener;
-import java.awt.*;
-
/**
* DataStoreTransactionManagerPlugIn is a ToolBox containing:
* <ul>
@@ -37,8 +34,8 @@
*/
public class DataStoreTransactionManagerPlugIn extends ToolboxPlugIn
implements WorkbenchContextReference {
- final Logger LOG =
Logger.getLogger(DataStoreTransactionManagerPlugIn.class);
+
private static final String KEY =
DataStoreTransactionManagerPlugIn.class.getName();
private static final String INSTANCE_KEY = KEY + " - INSTANCE";
@@ -71,7 +68,7 @@
context.getWorkbenchFrame().addTaskListener(new TaskListener() {
public void taskAdded(TaskEvent taskEvent) {
final Task task = taskEvent.getTask();
- LOG.info("Task added : " + task.getName());
+ Logger.info("Task added : " + task.getName());
java.util.List<Layer> layers =
task.getLayerManager().getLayers();
for (Layer layer : layers) {
if (layer.getDataSourceQuery().getDataSource() instanceof
WritableDataStoreDataSource) {
@@ -82,7 +79,7 @@
}
public void taskLoaded(TaskEvent taskEvent) {
final Task task = taskEvent.getTask();
- LOG.info("Task loaded : " + task.getName());
+ Logger.info("Task loaded : " + task.getName());
java.util.List<Layer> layers =
taskEvent.getTask().getLayerManager().getLayers();
for (Layer layer : layers) {
if (layer.getDataSourceQuery().getDataSource() instanceof
WritableDataStoreDataSource) {
@@ -110,7 +107,7 @@
getTaskFrame().addInternalFrameListener(new InternalFrameAdapter() {
@Override
public void internalFrameActivated(InternalFrameEvent e) {
- LOG.trace("Task frame activated " +
e.getInternalFrame().getTitle());
+ Logger.trace("Task frame activated " +
e.getInternalFrame().getTitle());
if (getTransactionManagerPanel() != null) {
getTransactionManagerPanel().updateListener(task);
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/Evolution.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/Evolution.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/Evolution.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -1,19 +1,19 @@
package org.openjump.core.ui.plugin.datastore.transaction;
+import java.util.Arrays;
+import java.util.Set;
+
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.feature.Feature;
-import org.apache.log4j.Logger;
+import com.vividsolutions.jump.workbench.Logger;
-import java.util.Arrays;
-import java.util.Set;
-
/**
* A Feature Evolution. It keeps a clone of the previous state of the feature
* ( null for a creation) and the new state of the feature (null for a
suppression).
*/
public class Evolution {
- final Logger LOG = Logger.getLogger(Evolution.class);
+
private final static String KEY = Evolution.class.getName();
public static enum Type {CREATION, MODIFICATION, SUPPRESSION}
@@ -74,8 +74,8 @@
if (type1 != Type.SUPPRESSION && type2 != Type.CREATION &&
!Arrays.equals(evo1New.getAttributes(),
evo2Old.getAttributes())) {
- LOG.info("Try to merge : " + previous);
- LOG.info(" with : " + this);
+ Logger.info("Try to merge : " + previous);
+ Logger.info(" with : " + this);
throw new EvolutionOperationException(KEY +
I18N.get(".cannot-merge-non-consecutive-evolutions"));
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/TransactionManagerPanel.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/TransactionManagerPanel.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/ui/plugin/datastore/transaction/TransactionManagerPanel.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -1,22 +1,40 @@
package org.openjump.core.ui.plugin.datastore.transaction;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Collection;
+
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.ScrollPaneConstants;
+
+import org.openjump.core.ui.plugin.datastore.WritableDataStoreDataSource;
+
import com.vividsolutions.jump.I18N;
import com.vividsolutions.jump.io.datasource.DataSource;
import com.vividsolutions.jump.workbench.JUMPWorkbench;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.WorkbenchContext;
-import com.vividsolutions.jump.workbench.model.*;
+import com.vividsolutions.jump.workbench.model.FeatureEvent;
+import com.vividsolutions.jump.workbench.model.Layer;
+import com.vividsolutions.jump.workbench.model.LayerAdapter;
+import com.vividsolutions.jump.workbench.model.LayerEvent;
+import com.vividsolutions.jump.workbench.model.LayerEventType;
+import com.vividsolutions.jump.workbench.model.LayerListener;
+import com.vividsolutions.jump.workbench.model.LayerManager;
+import com.vividsolutions.jump.workbench.model.Task;
import com.vividsolutions.jump.workbench.ui.ErrorHandler;
import com.vividsolutions.jump.workbench.ui.TaskFrame;
import com.vividsolutions.jump.workbench.ui.plugin.WorkbenchContextReference;
-import org.apache.log4j.Logger;
-import org.openjump.core.ui.plugin.datastore.WritableDataStoreDataSource;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Collection;
-
/**
* Panel displaying current uncommitted edits and including the commit button.
*/
@@ -24,8 +42,8 @@
private static final String KEY = TransactionManagerPanel.class.getName();
- final Logger LOG = Logger.getLogger(TransactionManagerPanel.class);
+
final DataStoreTransactionManager transactionManager;
final ErrorHandler errorHandler;
final JTextArea textArea;
@@ -125,7 +143,7 @@
updateTextArea(task);
}
else {
- LOG.error(I18N.get(KEY +
".layer-with-irrelevant-datastore-datasource"));
+ Logger.error(I18N.get(KEY +
".layer-with-irrelevant-datastore-datasource"));
}
}
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/mousemenu/category/SetCategoryVisibilityPlugIn.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/mousemenu/category/SetCategoryVisibilityPlugIn.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/ui/plugin/mousemenu/category/SetCategoryVisibilityPlugIn.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -21,7 +21,7 @@
import javax.swing.JComponent;
import javax.swing.JPopupMenu;
-import org.apache.log4j.Logger;
+
import org.openjump.core.apitools.PlugInContextTools;
import com.vividsolutions.jump.I18N;
@@ -56,7 +56,7 @@
protected static SetCategoryVisibilityPlugIn instance= null;
- private static final Logger LOG =
Logger.getLogger(SetCategoryVisibilityPlugIn.class);
+
/**
* Constructor needed to load PlugIn from classes, should NOT be used by
any other
Modified:
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterImageLayerPropertiesPlugIn.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterImageLayerPropertiesPlugIn.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/ui/plugin/raster/RasterImageLayerPropertiesPlugIn.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -25,7 +25,7 @@
import javax.swing.JTabbedPane;
import javax.swing.border.Border;
-import org.apache.log4j.Logger;
+
import org.openjump.core.apitools.LayerTools;
import org.openjump.core.rasterimage.RasterImageLayer;
import org.openjump.core.rasterimage.TiffTags.TiffReadingException;
@@ -169,7 +169,7 @@
.get("org.openjump.core.ui.plugin.raster.RasterImageLayerPropertiesPlugIn.ymax");
private final static String UNSPECIFIED = I18N
.get("coordsys.CoordinateSystem.unspecified");
- private static final Logger LOGGER = Logger.getLogger(HTMLFrame.class);
+
private Envelope extent;
/*
Modified:
core/trunk/src/org/openjump/core/ui/plugin/raster/nodata/ChangeRangeValuesToNoDataPlugIn.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/raster/nodata/ChangeRangeValuesToNoDataPlugIn.java
2016-01-10 18:45:58 UTC (rev 4767)
+++
core/trunk/src/org/openjump/core/ui/plugin/raster/nodata/ChangeRangeValuesToNoDataPlugIn.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -24,7 +24,7 @@
import javax.swing.JPanel;
import javax.swing.JTextField;
-import org.apache.log4j.Logger;
+
import org.openjump.core.apitools.LayerTools;
import org.openjump.core.rasterimage.RasterImageIOUtils;
import org.openjump.core.rasterimage.RasterImageLayer;
@@ -59,8 +59,7 @@
* Substitute export to .flt file to .asc file
* @date 2015_15_11 (Giuseppe Aruta) Improved GUI
*/
- private static final Logger LOGGER = Logger
- .getLogger(ChangeNoDataValuePlugIn.class);
+
private Properties properties = null;
private String byteOrder = "LSBFIRST";
private static String propertiesFile = LoadSextanteRasterImagePlugIn
Modified: core/trunk/src/org/openjump/core/ui/plugin/style/ImportSLDPlugIn.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/style/ImportSLDPlugIn.java
2016-01-10 18:45:58 UTC (rev 4767)
+++ core/trunk/src/org/openjump/core/ui/plugin/style/ImportSLDPlugIn.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -70,7 +70,6 @@
import javax.swing.JPopupMenu;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.apache.log4j.Logger;
import org.openjump.core.ui.images.IconLoader;
import org.openjump.core.ui.swing.SelectFromListPanel;
import org.w3c.dom.Document;
@@ -78,8 +77,9 @@
import com.vividsolutions.jump.feature.AttributeType;
import com.vividsolutions.jump.feature.FeatureSchema;
import com.vividsolutions.jump.util.Blackboard;
+import com.vividsolutions.jump.util.Range;
import com.vividsolutions.jump.util.Range.RangeTreeMap;
-import com.vividsolutions.jump.util.Range;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.WorkbenchContext;
import com.vividsolutions.jump.workbench.model.Layer;
import com.vividsolutions.jump.workbench.model.Layerable;
@@ -88,14 +88,13 @@
import com.vividsolutions.jump.workbench.plugin.EnableCheckFactory;
import com.vividsolutions.jump.workbench.plugin.MultiEnableCheck;
import com.vividsolutions.jump.workbench.plugin.PlugInContext;
+import com.vividsolutions.jump.workbench.ui.OKCancelDialog;
import com.vividsolutions.jump.workbench.ui.OKCancelDialog.Validator;
-import com.vividsolutions.jump.workbench.ui.OKCancelDialog;
import com.vividsolutions.jump.workbench.ui.WorkbenchFrame;
import com.vividsolutions.jump.workbench.ui.plugin.FeatureInstaller;
import com.vividsolutions.jump.workbench.ui.renderer.style.BasicStyle;
import com.vividsolutions.jump.workbench.ui.renderer.style.ColorThemingStyle;
import com.vividsolutions.jump.workbench.ui.renderer.style.LabelStyle;
-import com.vividsolutions.jump.workbench.ui.renderer.style.Style;
import com.vividsolutions.jump.workbench.ui.renderer.style.VertexStyle;
/**
@@ -108,8 +107,6 @@
*/
public class ImportSLDPlugIn extends AbstractPlugIn {
- private static Logger LOG = getLogger(ImportSLDPlugIn.class);
-
public static final ImageIcon ICON = IconLoader.icon("sld_in_16.png");
@Override
@@ -190,7 +187,7 @@
try {
if
(cts.getAttributeValueToLabelMap().keySet().iterator().next() instanceof Range)
{
- LOG.debug("Color theming values are ranges.");
+ Logger.debug("Color theming values are ranges.");
//RangeTreeMap<Range, BasicStyle> map = new
RangeTreeMap<Range, BasicStyle>();
//RangeTreeMap<Range, String> labelMap = new
RangeTreeMap<Range, String>();
RangeTreeMap<Object, BasicStyle> map = new
RangeTreeMap<Object, BasicStyle>();
@@ -202,7 +199,7 @@
Map<Object, String> oldLabelMap =
cts.getAttributeValueToLabelMap();
if (c.equals(Integer.class)) {
- LOG.debug("Color theming values are ranges of
integers.");
+ Logger.debug("Color theming values are ranges of
integers.");
for (Object k :
cts.getAttributeValueToBasicStyleMap().keySet()) {
Range r = (Range) k;
Range newRange = new
Range(Integer.valueOf((String) r.getMin()), r.isIncludingMin(),
@@ -213,7 +210,7 @@
}
if (c.equals(Double.class)) {
- LOG.debug("Color theming values are ranges of
doubles.");
+ Logger.debug("Color theming values are ranges of
doubles.");
for (Object k :
cts.getAttributeValueToBasicStyleMap().keySet()) {
Range r = (Range) k;
Range newRange = new Range(Double.valueOf((String)
r.getMin()), r.isIncludingMin(), Double
@@ -223,8 +220,8 @@
}
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Color theming values are ranges of java
class " + c + ".");
+ if (Logger.isDebugEnabled()) {
+ Logger.debug("Color theming values are ranges of java
class " + c + ".");
}
cts.setAttributeValueToBasicStyleMap(map);
@@ -235,13 +232,13 @@
} catch (NumberFormatException e) {
throw e;
} catch (Exception e) {
- LOG.debug("Unknown error: ", e);
+ Logger.debug("Unknown error: ", e);
// ignore, probably no elements in the map
return;
}
if (c.equals(Integer.class)) {
- LOG.debug("Color theming values are integers.");
+ Logger.debug("Color theming values are integers.");
Map<Object, BasicStyle> map = new TreeMap<Object,
BasicStyle>();
Map<?, ?> oldMap = cts.getAttributeValueToBasicStyleMap();
Map<Object, String> labelMap = new TreeMap<Object, String>();
@@ -255,7 +252,7 @@
}
if (c.equals(Double.class)) {
- LOG.debug("Color theming values are doubles.");
+ Logger.debug("Color theming values are doubles.");
Map<Object, BasicStyle> map = new TreeMap<Object,
BasicStyle>();
Map<?, ?> oldMap = cts.getAttributeValueToBasicStyleMap();
Map<Object, String> labelMap = new TreeMap<Object, String>();
@@ -268,8 +265,8 @@
cts.setAttributeValueToLabelMap(labelMap);
}
- if (LOG.isDebugEnabled()) {
- LOG.debug("Color theming values are of java type " + c + ".");
+ if (Logger.isDebugEnabled()) {
+ Logger.debug("Color theming values are of java type " + c +
".");
}
return;
@@ -279,7 +276,7 @@
showMessageDialog(frame, getMessage(
"org.openjump.core.ui.plugin.style.ImportSLDPlugIn.Error-reading-styles", new
Object[] { e
.getLocalizedMessage() }),
get("com.vividsolutions.wms.WMService.Error"), ERROR_MESSAGE);
- LOG.debug("Probably unknown attribute name: ", e);
+ Logger.debug("Probably unknown attribute name: ", e);
return;
}
}
Modified: core/trunk/src/org/openjump/core/ui/plugin/view/SuperZoomPanTool.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/view/SuperZoomPanTool.java
2016-01-10 18:45:58 UTC (rev 4767)
+++ core/trunk/src/org/openjump/core/ui/plugin/view/SuperZoomPanTool.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -1,38 +1,39 @@
package org.openjump.core.ui.plugin.view;
-import com.vividsolutions.jts.geom.Coordinate;
+import java.awt.BasicStroke;
import java.awt.Color;
import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.Graphics2D;
+import java.awt.Image;
import java.awt.Point;
+import java.awt.Rectangle;
import java.awt.Shape;
+import java.awt.Transparency;
import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
import java.awt.geom.NoninvertibleTransformException;
import java.awt.geom.Point2D;
+import java.awt.image.BufferedImage;
import javax.swing.Icon;
+import javax.swing.SwingUtilities;
+import javax.swing.Timer;
+import org.openjump.core.ui.util.ScreenScale;
+
+import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jump.I18N;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.ui.LayerViewPanel;
import com.vividsolutions.jump.workbench.ui.Viewport;
import com.vividsolutions.jump.workbench.ui.cursortool.DragTool;
import com.vividsolutions.jump.workbench.ui.images.IconLoader;
-import java.awt.BasicStroke;
-import java.awt.Dimension;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.Rectangle;
-import java.awt.Transparency;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseWheelEvent;
-import java.awt.event.MouseWheelListener;
-import java.awt.image.BufferedImage;
-import javax.swing.SwingUtilities;
-import javax.swing.Timer;
-import org.apache.log4j.Logger;
-import org.openjump.core.ui.util.ScreenScale;
/**
* This tool have the following functions:
@@ -476,10 +477,10 @@
redrawImage();
break;
default:
- Logger.getLogger(SuperZoomPanTool.class).warn("Unknown
indicatorMode " + getIndicatorMode() + "!");
+ Logger.warn("Unknown indicatorMode " + getIndicatorMode()
+ "!");
}
} catch (Exception e) {
- Logger.getLogger(SuperZoomPanTool.class).error("Unable to redraw
the visual indicator!", e);
+ Logger.error("Unable to redraw the visual indicator!", e);
}
}
Modified:
core/trunk/src/org/openjump/core/ui/plugin/wms/ZoomToWMSLayerPlugIn.java
===================================================================
--- core/trunk/src/org/openjump/core/ui/plugin/wms/ZoomToWMSLayerPlugIn.java
2016-01-10 18:45:58 UTC (rev 4767)
+++ core/trunk/src/org/openjump/core/ui/plugin/wms/ZoomToWMSLayerPlugIn.java
2016-01-10 18:47:43 UTC (rev 4768)
@@ -4,23 +4,25 @@
import javax.swing.ImageIcon;
+import com.vividsolutions.jts.geom.Envelope;
import com.vividsolutions.jump.I18N;
+import com.vividsolutions.jump.geom.EnvelopeUtil;
+import com.vividsolutions.jump.workbench.Logger;
import com.vividsolutions.jump.workbench.WorkbenchContext;
-import com.vividsolutions.jump.workbench.plugin.*;
-import com.vividsolutions.jump.workbench.model.*;
-import com.vividsolutions.wms.*;
-import com.vividsolutions.jts.geom.*;
+import com.vividsolutions.jump.workbench.model.WMSLayer;
+import com.vividsolutions.jump.workbench.plugin.AbstractPlugIn;
+import com.vividsolutions.jump.workbench.plugin.EnableCheck;
+import com.vividsolutions.jump.workbench.plugin.EnableCheckFactory;
+import com.vividsolutions.jump.workbench.plugin.MultiEnableCheck;
+import com.vividsolutions.jump.workbench.plugin.PlugInContext;
@@ Diff output truncated at 100000 characters. @@
------------------------------------------------------------------------------
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=267308311&iu=/4140
_______________________________________________
Jump-pilot-devel mailing list
Jump-pilot-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jump-pilot-devel
