[ jEdit-commits ] SF.net SVN: jedit:[23602] plugins/SVNPlugin/branches/1.7.5_svn_1.8.5

[<dal...@us...>]

Revision: 23602
          http://sourceforge.net/p/jedit/svn/23602
Author:   daleanson
Date:     2014-06-25 22:43:14 +0000 (Wed, 25 Jun 2014)
Log Message:
-----------
Removed dependency on Java 1.7, 1.6 is good enough now.

Modified Paths:
--------------
    plugins/SVNPlugin/branches/1.7.5_svn_1.8.5/SVNPlugin.props
    plugins/SVNPlugin/branches/1.7.5_svn_1.8.5/build.xml
    plugins/SVNPlugin/branches/1.7.5_svn_1.8.5/src/ise/plugin/svn/gui/PVSVNOptionPane.java

Modified: plugins/SVNPlugin/branches/1.7.5_svn_1.8.5/SVNPlugin.props
===================================================================
--- plugins/SVNPlugin/branches/1.7.5_svn_1.8.5/SVNPlugin.props	2014-06-25 22:37:35 UTC (rev 23601)
+++ plugins/SVNPlugin/branches/1.7.5_svn_1.8.5/SVNPlugin.props	2014-06-25 22:43:14 UTC (rev 23602)
@@ -13,7 +13,7 @@
 plugin.ise.plugin.svn.SVNPlugin.docs=docs/index.html
 
 # dependencies
-plugin.ise.plugin.svn.SVNPlugin.depend.0=jdk 1.7.0
+plugin.ise.plugin.svn.SVNPlugin.depend.0=jdk 1.6.0
 plugin.ise.plugin.svn.SVNPlugin.depend.1=jedit 05.02.01.00
 plugin.ise.plugin.svn.SVNPlugin.depend.2=plugin projectviewer.ProjectPlugin 3.5.2
 plugin.ise.plugin.svn.SVNPlugin.depend.3=plugin CommonControlsPlugin 1.7.4

Modified: plugins/SVNPlugin/branches/1.7.5_svn_1.8.5/build.xml
===================================================================
--- plugins/SVNPlugin/branches/1.7.5_svn_1.8.5/build.xml	2014-06-25 22:37:35 UTC (rev 23601)
+++ plugins/SVNPlugin/branches/1.7.5_svn_1.8.5/build.xml	2014-06-25 22:43:14 UTC (rev 23602)
@@ -24,7 +24,7 @@
     <mkdir dir="${src.dir}"/>
     
     <!-- java source and target version for compile -->
-    <property name="target" value="1.7"/>
+    <property name="target" value="1.6"/>
 
     <!-- library directory, location for third party jars -->
     <property name="lib.dir" location="lib"/>

Modified: plugins/SVNPlugin/branches/1.7.5_svn_1.8.5/src/ise/plugin/svn/gui/PVSVNOptionPane.java
===================================================================
--- plugins/SVNPlugin/branches/1.7.5_svn_1.8.5/src/ise/plugin/svn/gui/PVSVNOptionPane.java	2014-06-25 22:37:35 UTC (rev 23601)
+++ plugins/SVNPlugin/branches/1.7.5_svn_1.8.5/src/ise/plugin/svn/gui/PVSVNOptionPane.java	2014-06-25 22:43:14 UTC (rev 23602)
@@ -300,22 +300,25 @@
     }
 
     private int stringToWC( String wc ) {
-        switch ( wc ) {
-            case "1.3":
-                return SVNAdminAreaFactory.WC_FORMAT_13;
-            case "1.4":
-                return SVNAdminAreaFactory.WC_FORMAT_14;
-            case "1.5":
-                return SVNAdminAreaFactory.WC_FORMAT_15;
-            case "1.6":
-                return SVNAdminAreaFactory.WC_FORMAT_16;
-            case "1.7":
-                return ISVNWCDb.WC_FORMAT_17;
-            case "1.8":
-                return ISVNWCDb.WC_FORMAT_18;
-            default:
-                return -1;
+        if ( wc.equals( "1.3" ) ) {
+            return SVNAdminAreaFactory.WC_FORMAT_13;
         }
+        if ( wc.equals( "1.4" ) ) {
+            return SVNAdminAreaFactory.WC_FORMAT_14;
+        }
+        if ( wc.equals( "1.5" ) ) {
+            return SVNAdminAreaFactory.WC_FORMAT_15;
+        }
+        if ( wc.equals( "1.7" ) ) {
+            return SVNAdminAreaFactory.WC_FORMAT_16;
+        }
+        if ( wc.equals( "1.7" ) ) {
+            return ISVNWCDb.WC_FORMAT_17;
+        }
+        if ( wc.equals( "1.8" ) ) {
+            return ISVNWCDb.WC_FORMAT_18;
+        }
+        return -1;
     }
 
     private String getProjectName() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.