[Gzz-commits] storm ./Makefile org/nongnu/storm/pointers/SetP...

[Benja Fallenstein]

CVSROOT:        /cvsroot/storm
Module name:    storm
Changes by:     Benja Fallenstein <address@hidden>      03/05/09 12:46:25

Modified files:
        .              : Makefile 
        org/nongnu/storm/pointers: SetPointer.java 

Log message:
        Also allow creating a pointer without giving a target; in Makefile, 
give default for KEYFILE

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/Makefile.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/storm/storm/org/nongnu/storm/pointers/SetPointer.java.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: storm/Makefile
diff -u storm/Makefile:1.16 storm/Makefile:1.17
--- storm/Makefile:1.16 Fri May  9 11:52:47 2003
+++ storm/Makefile      Fri May  9 12:46:25 2003
@@ -10,6 +10,7 @@
 export CLASSPATH
 JAVAC=javac
 JAVA=java
+KEYFILE=my.keys
 
 clean:
        @echo "Removing everything found in .cvsignores"
Index: storm/org/nongnu/storm/pointers/SetPointer.java
diff -u storm/org/nongnu/storm/pointers/SetPointer.java:1.3 
storm/org/nongnu/storm/pointers/SetPointer.java:1.4
--- storm/org/nongnu/storm/pointers/SetPointer.java:1.3 Fri May  9 12:42:23 2003
+++ storm/org/nongnu/storm/pointers/SetPointer.java     Fri May  9 12:46:25 2003
@@ -35,7 +35,7 @@
 
 public class SetPointer {
 
-    /** Usage is SetPointer keyfile pool [pointer] target.
+    /** Usage is SetPointer keyfile [pool [pointer] target].
      *  If no pointer is given, a new one is generated.
      *  If the key file doesn't exist, it's created.
      */
@@ -57,6 +57,13 @@
                new ObjectOutputStream(new FileOutputStream(keyFile));
            out.writeObject(keys);
            out.close();
+       }
+
+       if(argv.length == 1) {
+           PointerId pointer = new PointerId(keys.getPublic());
+           System.out.println("Pointer created:");
+           System.out.println(pointer);
+           System.exit(0);
        }
 
        Set indexTypes = Collections.singleton(PointerIndex.type);