[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/utils Settings.java,1.4,1.5 Version.java,1.5,1.6

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/client/utils

Modified Files:
	Settings.java Version.java 
Log Message:
+ Client is usable without server

Index: Settings.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Settings.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Settings.java	16 Feb 2005 09:02:03 -0000	1.4
--- Settings.java	11 May 2005 10:51:31 -0000	1.5
***************
*** 14,17 ****
--- 14,18 ----
    public static final int      TIMEOUT             = 15000;
    public static final int      POLL_INTERVAL       = 5000;
+   public static final long     POLL_DELAY          = 500;
    public static String         WEBSERVICE_PATH     = "/magicmap/services/";
  
***************
*** 19,25 ****
    public static String         clientName          = "mobilepdp11";
    public static String         clientPassword      = "test";
  
-   public static String         NIGHTLY = "";
-   
    public static String         hostname            = "phl.informatik.hu-berlin.de";
    public static int            port                = 80;
--- 20,27 ----
    public static String         clientName          = "mobilepdp11";
    public static String         clientPassword      = "test";
+   public static boolean        useNoServer         = false;
+ 
+   public static String         NIGHTLY             = "";
  
    public static String         hostname            = "phl.informatik.hu-berlin.de";
    public static int            port                = 80;
***************
*** 70,77 ****
     */
    public static void setup(String[] args){
!     if (args!=null && args.length>0){
        for (int i = 0; i < args.length; i++){
          boolean accepted = false;
!         String arg = args[i].toLowerCase();        
          if (arg.equals("--webservicepath")){
            i++;
--- 72,79 ----
     */
    public static void setup(String[] args){
!     if (args != null && args.length > 0){
        for (int i = 0; i < args.length; i++){
          boolean accepted = false;
!         String arg = args[i].toLowerCase();
          if (arg.equals("--webservicepath")){
            i++;
***************
*** 84,89 ****
        }
      }
!     
    }
  
  }
\ No newline at end of file
--- 86,104 ----
        }
      }
! 
    }
  
+   /**
+    * @return Returns the useNoServer.
+    */
+   public static boolean isUseNoServer(){
+     return useNoServer;
+   }
+ 
+   /**
+    * @param useNoServer The useNoServer to set.
+    */
+   public static void setUseNoServer(boolean useNoServer){
+     Settings.useNoServer = useNoServer;
+   }
  }
\ No newline at end of file

Index: Version.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Version.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Version.java	16 Feb 2005 20:37:23 -0000	1.5
--- Version.java	11 May 2005 10:51:31 -0000	1.6
***************
*** 13,23 ****
  
    public static final String PROTOCOL_VERSION = "0.3";
!   public static final int VERSION_MAJOR = 0;
!   public static final int VERSION_MINOR = 5;
!   public static final String VERSION_FLAVOR = "alpha";
!     
    public static String getVersion(){
!     return VERSION_MAJOR + "." + VERSION_MINOR  + VERSION_FLAVOR + " " + Settings.NIGHTLY;
    }
!   
  }
\ No newline at end of file
--- 13,23 ----
  
    public static final String PROTOCOL_VERSION = "0.3";
!   public static final int    VERSION_MAJOR    = 0;
!   public static final int    VERSION_MINOR    = 5;
!   public static final String VERSION_FLAVOR   = "alpha";
! 
    public static String getVersion(){
!     return VERSION_MAJOR + "." + VERSION_MINOR + VERSION_FLAVOR + " " + Settings.NIGHTLY;
    }
! 
  }
\ No newline at end of file