Revision: 4744
http://sourceforge.net/p/jump-pilot/code/4744
Author: michaudm
Date: 2016-01-09 18:39:42 +0000 (Sat, 09 Jan 2016)
Log Message:
-----------
4 small fixes to make OpenJUMP 1.9 version java6 compatible
Modified Paths:
--------------
core/trunk/ChangeLog
core/trunk/src/com/vividsolutions/jump/datastore/jdbc/DelegatingDriver.java
core/trunk/src/com/vividsolutions/jump/util/FileUtil.java
core/trunk/src/org/openjump/core/rasterimage/GDALInternalMetadata.java
core/trunk/src/org/openjump/core/ui/plugin/layer/pirolraster/panel/RasterColorEditorPanel.java
Modified: core/trunk/ChangeLog
===================================================================
--- core/trunk/ChangeLog 2016-01-09 17:50:33 UTC (rev 4743)
+++ core/trunk/ChangeLog 2016-01-09 18:39:42 UTC (rev 4744)
@@ -5,6 +5,7 @@
2016-01-09 mmichaud <m.michael.mich...@orange.fr>
* fix a regression introduced in r4720 in PostGISWriter
+ * 4 small fixes to make OpenJUMP 1.9 version java6 compatible
2016-01-04 mmichaud <m.michael.mich...@orange.fr>
* With postgis, don't try to convert every text field into geometry !
Modified:
core/trunk/src/com/vividsolutions/jump/datastore/jdbc/DelegatingDriver.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/datastore/jdbc/DelegatingDriver.java
2016-01-09 17:50:33 UTC (rev 4743)
+++ core/trunk/src/com/vividsolutions/jump/datastore/jdbc/DelegatingDriver.java
2016-01-09 18:39:42 UTC (rev 4744)
@@ -54,7 +54,9 @@
}
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
- return driver.getParentLogger();
+ //TODO - can be restored after OpenJUMP 1.9 release
+ //return driver.getParentLogger();
+ throw new SQLFeatureNotSupportedException();
}
/**
Modified: core/trunk/src/com/vividsolutions/jump/util/FileUtil.java
===================================================================
--- core/trunk/src/com/vividsolutions/jump/util/FileUtil.java 2016-01-09
17:50:33 UTC (rev 4743)
+++ core/trunk/src/com/vividsolutions/jump/util/FileUtil.java 2016-01-09
18:39:42 UTC (rev 4744)
@@ -200,7 +200,7 @@
OutputStreamWriter osw = null;
try {
osw = new OutputStreamWriter(new FileOutputStream(filename), encoding);
- String lineSep = System.lineSeparator();
+ String lineSep = System.getProperty("line.separator");
for (Iterator<String> it = lines.iterator(); it.hasNext();) {
osw.write(it.next());
if (it.hasNext()) {
Modified: core/trunk/src/org/openjump/core/rasterimage/GDALInternalMetadata.java
===================================================================
--- core/trunk/src/org/openjump/core/rasterimage/GDALInternalMetadata.java
2016-01-09 17:50:33 UTC (rev 4743)
+++ core/trunk/src/org/openjump/core/rasterimage/GDALInternalMetadata.java
2016-01-09 18:39:42 UTC (rev 4744)
@@ -5,23 +5,15 @@
*/
package org.openjump.core.rasterimage;
-import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-import java.io.StringReader;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.openjump.core.rasterimage.Stats;
import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
/**
@@ -44,7 +36,7 @@
SAXParser parser = factory.newSAXParser();
//XMLReader reader = parser.getXMLReader();
- parser.parse(new
ByteArrayInputStream(statsTag.getBytes(StandardCharsets.UTF_8)), this);
+ parser.parse(new ByteArrayInputStream(statsTag.getBytes("UTF-8")),
this);
sampleNr++;
Stats stats = new Stats(sampleNr);
Modified:
core/trunk/src/org/openjump/core/ui/plugin/layer/pirolraster/panel/RasterColorEditorPanel.java
===================================================================
---
core/trunk/src/org/openjump/core/ui/plugin/layer/pirolraster/panel/RasterColorEditorPanel.java
2016-01-09 17:50:33 UTC (rev 4743)
+++
core/trunk/src/org/openjump/core/ui/plugin/layer/pirolraster/panel/RasterColorEditorPanel.java
2016-01-09 18:39:42 UTC (rev 4744)
@@ -62,9 +62,9 @@
private JLabel toValueLabel;
public JTextField toValue;
public JTextField Chooser;
- public JComboBox<?> colorScaleChooser;
- public JComboBox<?> colorRampChooser;
- public JComboBox<?> typeChooser;
+ public JComboBox colorScaleChooser;
+ public JComboBox colorRampChooser;
+ public JComboBox typeChooser;
private ColorGenerator colorGenerator;
private JSpinner spinnerbox;
------------------------------------------------------------------------------
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
