From: František Dvořák <valtri@civ.zcu.cz>
Date: Tue, 15 Apr 2008 14:25:24 +0000 (+0000)
Subject: Portability for Java 1.4.
X-Git-Tag: glite-yaim-lb_R_4_0_2_1~95
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=97757608c7d1a1f45d4feb1b41c0bce1fdd1fa44;p=jra1mw.git

Portability for Java 1.4.
---

diff --git a/org.glite.jobid.api-java/nbproject/build-impl.xml b/org.glite.jobid.api-java/nbproject/build-impl.xml
index d27c53e..47755b4 100755
--- a/org.glite.jobid.api-java/nbproject/build-impl.xml
+++ b/org.glite.jobid.api-java/nbproject/build-impl.xml
@@ -112,7 +112,7 @@ is divided into following sections:
         <condition property="do.depend.true">
             <istrue value="${do.depend}"/>
         </condition>
-        <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
+        <condition property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
             <and>
                 <isset property="jaxws.endorsed.dir"/>
                 <available file="nbproject/jaxws-build.xml"/>
@@ -155,7 +155,7 @@ is divided into following sections:
             <attribute default="" name="sourcepath"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}">
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" sourcepath="@{sourcepath}" srcdir="@{srcdir}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -250,7 +250,7 @@ is divided into following sections:
                 <contains string="${version-output}" substring="java version &quot;1.3"/>
             </or>
         </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
+        <condition property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
             <istrue value="${have-jdk-older-than-1.4}"/>
         </condition>
     </target>
@@ -467,7 +467,7 @@ is divided into following sections:
             -->
     <target depends="init" name="-javadoc-build">
         <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
diff --git a/org.glite.jobid.api-java/nbproject/project.properties b/org.glite.jobid.api-java/nbproject/project.properties
index 6f5b943..2958811 100755
--- a/org.glite.jobid.api-java/nbproject/project.properties
+++ b/org.glite.jobid.api-java/nbproject/project.properties
@@ -26,8 +26,8 @@ javac.classpath=\
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
+javac.source=
+javac.target=
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -59,3 +59,4 @@ run.test.classpath=\
 source.encoding=UTF-8
 src.dir=src
 test.src.dir=test
+javac.compilerargs.jaxws=
diff --git a/org.glite.jobid.api-java/src/org/glite/jobid/api_java/CheckedString.java b/org.glite.jobid.api-java/src/org/glite/jobid/api_java/CheckedString.java
index 13ec053..42dcf14 100755
--- a/org.glite.jobid.api-java/src/org/glite/jobid/api_java/CheckedString.java
+++ b/org.glite.jobid.api-java/src/org/glite/jobid/api_java/CheckedString.java
@@ -52,7 +52,6 @@ public class CheckedString {
      * 
      * @return converted string
      */
-    @Override
     public String toString() {
         return checkedString;
     }
diff --git a/org.glite.jobid.api-java/src/org/glite/jobid/api_java/Jobid.java b/org.glite.jobid.api-java/src/org/glite/jobid/api_java/Jobid.java
index e65f527..77854df 100755
--- a/org.glite.jobid.api-java/src/org/glite/jobid/api_java/Jobid.java
+++ b/org.glite.jobid.api-java/src/org/glite/jobid/api_java/Jobid.java
@@ -137,7 +137,7 @@ public class Jobid {
         String uniqueS = jobidString.substring(dashAfterPort+1, jobidString.length());
         
         this.bkserver = bkserverS;
-        this.port = portS;
+        this.port = portS.intValue();
         this.unique = (new CheckedString(uniqueS)).toString();
     }
 
@@ -219,7 +219,6 @@ public class Jobid {
      * 
      * @return Jobid string representation in format bkserver:port/unique
      */
-    @Override
     public String toString() {
         return bkserver + ":" + port + "/" + unique;
     }