[Jrisk-cvs] SF.net SVN: jrisk:[584] XcodeTranslationTool/src/net/yura/translation

[<yu...@us...>]

Revision: 584
          http://jrisk.svn.sourceforge.net/jrisk/?rev=584&view=rev
Author:   yuranet
Date:     2011-11-17 20:45:32 +0000 (Thu, 17 Nov 2011)
Log Message:
-----------
run server

Modified Paths:
--------------
    XcodeTranslationTool/src/net/yura/translation/plugins/xcode/XcodeComm.java
    XcodeTranslationTool/src/net/yura/translation/server/XcodeServer.java

Modified: XcodeTranslationTool/src/net/yura/translation/plugins/xcode/XcodeComm.java
===================================================================
--- XcodeTranslationTool/src/net/yura/translation/plugins/xcode/XcodeComm.java	2011-11-17 20:16:36 UTC (rev 583)
+++ XcodeTranslationTool/src/net/yura/translation/plugins/xcode/XcodeComm.java	2011-11-17 20:45:32 UTC (rev 584)
@@ -95,7 +95,7 @@
             File file = new File(selectedFile.getParentFile(), "en.lproj"); // default to english
             //default to english if possible
             if (file.exists()) {
-                project = new Project(selectedFile, file);
+                load(selectedFile, file);
                 return true;
             }
             final File[] files = selectedFile.getParentFile().listFiles(new FilenameFilter() {
@@ -118,7 +118,7 @@
 
             if (result == JOptionPane.OK_OPTION) {
 
-                project = new Project(selectedFile, (File) files[chooser.getSelectedIndex()]);
+                load(selectedFile, (File) files[chooser.getSelectedIndex()]);
                 return true;
             }
 
@@ -126,6 +126,10 @@
         return false;
 
     }
+    
+    public void load(File xcodeproj, File lproj) throws Exception {
+        project = new Project(xcodeproj,lproj);
+    }
 
     public void setupFilter(JFileChooser fc) {
         FileFilter ff = new FileFilter() {

Modified: XcodeTranslationTool/src/net/yura/translation/server/XcodeServer.java
===================================================================
--- XcodeTranslationTool/src/net/yura/translation/server/XcodeServer.java	2011-11-17 20:16:36 UTC (rev 583)
+++ XcodeTranslationTool/src/net/yura/translation/server/XcodeServer.java	2011-11-17 20:45:32 UTC (rev 584)
@@ -1,5 +1,6 @@
 package net.yura.translation.server;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
@@ -16,6 +17,7 @@
 import net.yura.socketserver.SocketSession;
 import net.yura.translation.Mtcomm;
 import net.yura.translation.plugins.NetComm;
+import net.yura.translation.plugins.xcode.XcodeComm;
 
 /**
  * @author Yura
@@ -24,7 +26,7 @@
     
     public static class MyClientSession implements ClientSession {
 
-        Mtcomm comm;
+        static Mtcomm comm;
         PrivateKey key;
         
         ObjectOutputStream out;
@@ -91,7 +93,7 @@
 				byte[] pass = cipher.doFinal( (byte[])args[1] );
 				Class myclass = Class.forName( (String)args[3] );
 
-				Mtcomm myobject = (Mtcomm)myclass.newInstance();
+				//Mtcomm myobject = (Mtcomm)myclass.newInstance();
 
 				String username = new String(name);
                                 String password = new String(pass);
@@ -100,9 +102,9 @@
                                 
 				if (!args[2].equals( "1" )) { throw new Exception("client server version missmatch"); }
 
-				comm = myobject;
+				//comm = myobject;
 
-                                comm.load();
+                                //comm.load();
                                 
 				ss.sendObject("OK");
 
@@ -189,6 +191,30 @@
         myServer.setClientSessionClass( MyClientSession.class );
         myServer.startServer();
         
+
+        String theFile="I:/6_Yura/Work/java/badoo/repo/iPhone/Badoo.xcodeproj";
+        if (args.length != 0) {
+            StringBuilder builder = new StringBuilder();
+            for (int c=0;c<args.length;c++) {
+                builder.append(args[c]);
+                if (c < (args.length-1)) {
+                    builder.append(" ");
+                }
+            }
+            theFile = builder.toString();
+        }
+
+        File selectedFile = new File(theFile);
+        if (selectedFile.exists()) {
+            File file = new File(selectedFile.getParentFile(), "en.lproj");
+            MyClientSession.comm = new XcodeComm();
+            ((XcodeComm)MyClientSession.comm).load(selectedFile, file);
+        }
+        else {
+            System.out.println("pls provide *.xcodeproj file as command line arg");
+            System.exit(1);
+        }
+        
     }
     
 }

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