From 9c2f87c75147d302e9899387e3d1ba2fe67c71bd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ale=C5=A1=20K=C5=99enek?= <ljocha@ics.muni.cz>
Date: Wed, 30 Apr 2008 16:05:05 +0000
Subject: [PATCH] Get rid of unnecessary "api_java" moving sources to
 org/glite/jobid

---
 .../glite/jobid/{api_java => }/CheckedString.java  |  3 +-
 .../src/org/glite/jobid/ExampleJobid.java          | 43 ++++++++++++++++++++++
 .../src/org/glite/jobid/{api_java => }/Jobid.java  |  5 ++-
 3 files changed, 48 insertions(+), 3 deletions(-)
 rename org.glite.jobid.api-java/src/org/glite/jobid/{api_java => }/CheckedString.java (97%)
 mode change 100755 => 100644
 create mode 100644 org.glite.jobid.api-java/src/org/glite/jobid/ExampleJobid.java
 rename org.glite.jobid.api-java/src/org/glite/jobid/{api_java => }/Jobid.java (98%)
 mode change 100755 => 100644

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/CheckedString.java
old mode 100755
new mode 100644
similarity index 97%
rename from org.glite.jobid.api-java/src/org/glite/jobid/api_java/CheckedString.java
rename to org.glite.jobid.api-java/src/org/glite/jobid/CheckedString.java
index 42dcf14..e2fa489
--- a/org.glite.jobid.api-java/src/org/glite/jobid/api_java/CheckedString.java
+++ b/org.glite.jobid.api-java/src/org/glite/jobid/CheckedString.java
@@ -1,4 +1,4 @@
-package org.glite.jobid.api_java;
+package org.glite.jobid;
 
 /**
  * Class which escapes \ and new line signs in string which is set as parameter
@@ -52,6 +52,7 @@ public class CheckedString {
      * 
      * @return converted string
      */
+    @Override
     public String toString() {
         return checkedString;
     }
diff --git a/org.glite.jobid.api-java/src/org/glite/jobid/ExampleJobid.java b/org.glite.jobid.api-java/src/org/glite/jobid/ExampleJobid.java
new file mode 100644
index 0000000..bcb82d2
--- /dev/null
+++ b/org.glite.jobid.api-java/src/org/glite/jobid/ExampleJobid.java
@@ -0,0 +1,43 @@
+package org.glite.jobid;
+
+/**
+ * This class shows how Jobid works and how to work with it.
+ * @author Pavel Piskac
+ */
+public class ExampleJobid {
+    
+    public static void main(String[] args) {
+        //how Jobid class works
+        //unique part is automatically generated
+        Jobid jobid1 = new Jobid("https://somewhere.cz", 5000);
+        System.out.println("bkserver "+ jobid1.getBkserver());
+        System.out.println("port "+ jobid1.getPort());
+        System.out.println("unique "+ jobid1.getUnique());
+        System.out.println("-------------------");
+        
+        //unique part is set by user
+        Jobid jobid2 = new Jobid("https://somewhere.cz", 5000, "my_unique_part");
+        System.out.println("bkserver "+ jobid2.getBkserver());
+        System.out.println("port "+ jobid2.getPort());
+        System.out.println("unique "+ jobid2.getUnique());
+        System.out.println("-------------------");
+        
+        //whole jobid is set by user and then parsed
+        Jobid jobid3 = new Jobid("https://somewhere.cz:5000/my_unique_part");
+        System.out.println("bkserver "+ jobid3.getBkserver());
+        System.out.println("port "+ jobid3.getPort());
+        System.out.println("unique "+ jobid3.getUnique());
+        System.out.println("-------------------");
+        
+        //each part is set separately
+        Jobid jobid4 = new Jobid();
+        jobid4.setBkserver("https://somewhere.cz");
+        jobid4.setPort(5000);
+        jobid4.setUnique("my_unique_part");
+        System.out.println("bkserver "+ jobid4.getBkserver());
+        System.out.println("port "+ jobid4.getPort());
+        System.out.println("unique "+ jobid4.getUnique());
+        System.out.println("-------------------");
+    } 
+
+}
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/Jobid.java
old mode 100755
new mode 100644
similarity index 98%
rename from org.glite.jobid.api-java/src/org/glite/jobid/api_java/Jobid.java
rename to org.glite.jobid.api-java/src/org/glite/jobid/Jobid.java
index 77854df..fb9a8dd
--- a/org.glite.jobid.api-java/src/org/glite/jobid/api_java/Jobid.java
+++ b/org.glite.jobid.api-java/src/org/glite/jobid/Jobid.java
@@ -1,4 +1,4 @@
-package org.glite.jobid.api_java;
+package org.glite.jobid;
 
 import java.net.UnknownHostException;
 import java.security.MessageDigest;
@@ -137,7 +137,7 @@ public class Jobid {
         String uniqueS = jobidString.substring(dashAfterPort+1, jobidString.length());
         
         this.bkserver = bkserverS;
-        this.port = portS.intValue();
+        this.port = portS;
         this.unique = (new CheckedString(uniqueS)).toString();
     }
 
@@ -219,6 +219,7 @@ public class Jobid {
      * 
      * @return Jobid string representation in format bkserver:port/unique
      */
+    @Override
     public String toString() {
         return bkserver + ":" + port + "/" + unique;
     }
-- 
1.8.2.3