Update of
/var/cvs/applications/rmmci/generator/src/org/mmbase/bridge/remote/generator
In directory
james.mmbase.org:/tmp/cvs-serv1011/src/org/mmbase/bridge/remote/generator
Modified Files:
AbstractGenerator.java InterfaceGenerator.java
ObjectWrapperGenerator.java ProxyGenerator.java RMMCI.java
RmiGenerator.java
Log Message:
cleaned up a bit
See also:
http://cvs.mmbase.org/viewcvs/applications/rmmci/generator/src/org/mmbase/bridge/remote/generator
Index: AbstractGenerator.java
===================================================================
RCS file:
/var/cvs/applications/rmmci/generator/src/org/mmbase/bridge/remote/generator/AbstractGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AbstractGenerator.java 3 Nov 2008 18:39:09 -0000 1.2
+++ AbstractGenerator.java 20 Feb 2009 14:01:18 -0000 1.3
@@ -19,7 +19,7 @@
*
* @since MMBase-1.9
* @author Pierre van Rooden
- * @version $Id: AbstractGenerator.java,v 1.2 2008/11/03 18:39:09 michiel Exp $
+ * @version $Id: AbstractGenerator.java,v 1.3 2009/02/20 14:01:18 michiel Exp $
*/
abstract public class AbstractGenerator {
@@ -71,9 +71,10 @@
return className.substring(shortIndex + 1);
}
- public void writeSourceFile(String fileName) {
+ public void writeSourceFile(File file) {
try {
- File file = new File(fileName);
+ //System.out.println("Generating remote " + file);
+
FileOutputStream fos = new FileOutputStream(file);
fos.write(buffer.toString().getBytes());
fos.flush();
Index: InterfaceGenerator.java
===================================================================
RCS file:
/var/cvs/applications/rmmci/generator/src/org/mmbase/bridge/remote/generator/InterfaceGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- InterfaceGenerator.java 16 Jul 2008 13:28:20 -0000 1.2
+++ InterfaceGenerator.java 20 Feb 2009 14:01:18 -0000 1.3
@@ -10,6 +10,7 @@
package org.mmbase.bridge.remote.generator;
+import java.io.File;
import java.lang.reflect.*;
/**
@@ -17,7 +18,7 @@
*
* @since MMBase-1.9
* @author Pierre van Rooden
- * @version $Id: InterfaceGenerator.java,v 1.2 2008/07/16 13:28:20 michiel Exp
$
+ * @version $Id: InterfaceGenerator.java,v 1.3 2009/02/20 14:01:18 michiel Exp
$
*/
public class InterfaceGenerator extends AbstractClassGenerator {
@@ -103,10 +104,9 @@
buffer.append("}\n");
}
- public void generate(String remoteDir) {
+ public void generate(File remoteDir) {
generate();
- String filename = remoteDir + interfaceName + ".java";
- writeSourceFile(filename);
+ writeSourceFile(new File(remoteDir, interfaceName + ".java"));
}
}
Index: ObjectWrapperGenerator.java
===================================================================
RCS file:
/var/cvs/applications/rmmci/generator/src/org/mmbase/bridge/remote/generator/ObjectWrapperGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ObjectWrapperGenerator.java 3 Nov 2008 17:45:59 -0000 1.5
+++ ObjectWrapperGenerator.java 20 Feb 2009 14:01:18 -0000 1.6
@@ -11,6 +11,7 @@
package org.mmbase.bridge.remote.generator;
import java.util.*;
+import java.io.File;
/**
@@ -18,7 +19,7 @@
*
* @since MMBase-1.9
* @author Pierre van Rooden
- * @version $Id: ObjectWrapperGenerator.java,v 1.5 2008/11/03 17:45:59 michiel
Exp $
+ * @version $Id: ObjectWrapperGenerator.java,v 1.6 2009/02/20 14:01:18 michiel
Exp $
*/
public class ObjectWrapperGenerator extends AbstractGenerator {
@@ -137,10 +138,9 @@
buffer.append("}\n");
}
- public void generate(String remoteDir) {
+ public void generate(File remoteDir) {
generate();
- String filename = remoteDir + "ObjectWrapperHelper.java";
- writeSourceFile(filename);
+ writeSourceFile(new File(remoteDir, "ObjectWrapperHelper.java"));
}
}
Index: ProxyGenerator.java
===================================================================
RCS file:
/var/cvs/applications/rmmci/generator/src/org/mmbase/bridge/remote/generator/ProxyGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ProxyGenerator.java 16 Jul 2008 13:28:20 -0000 1.2
+++ ProxyGenerator.java 20 Feb 2009 14:01:18 -0000 1.3
@@ -12,6 +12,7 @@
import java.lang.reflect.*;
import java.util.*;
+import java.io.File;
/**
@@ -19,7 +20,7 @@
*
* @since MMBase-1.9
* @author Pierre van Rooden
- * @version $Id: ProxyGenerator.java,v 1.2 2008/07/16 13:28:20 michiel Exp $
+ * @version $Id: ProxyGenerator.java,v 1.3 2009/02/20 14:01:18 michiel Exp $
*/
public class ProxyGenerator extends AbstractClassGenerator {
@@ -270,10 +271,9 @@
buffer.append(" }\n\n");
}
- public void generate(String proxyDir) {
+ public void generate(File proxyDir) {
generate();
- String filename = proxyDir + proxyName + ".java";
- writeSourceFile(filename);
+ writeSourceFile(new File(proxyDir, proxyName + ".java"));
}
}
Index: RMMCI.java
===================================================================
RCS file:
/var/cvs/applications/rmmci/generator/src/org/mmbase/bridge/remote/generator/RMMCI.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- RMMCI.java 12 Jan 2009 21:31:54 -0000 1.5
+++ RMMCI.java 20 Feb 2009 14:01:18 -0000 1.6
@@ -18,35 +18,23 @@
*
* @since MMBase-1.9
* @author Pierre van Rooden
- * @version $Id: RMMCI.java,v 1.5 2009/01/12 21:31:54 michiel Exp $
+ * @version $Id: RMMCI.java,v 1.6 2009/02/20 14:01:18 michiel Exp $
*/
public class RMMCI {
- protected String targetDir = null;
- protected String remoteDir = null;
- protected String rmiDir = null;
- protected String proxyDir = null;
- protected List<Class<?>> objectsToWrap = new ArrayList<Class<?>>();
+ protected final File remoteDir;
+ protected final File rmiDir;
+ protected final File proxyDir;
+ protected final List<Class<?>> objectsToWrap = new ArrayList<Class<?>>();
public RMMCI(String targetDir) {
//check if the org/mmbase/bridge/remote dir exists
- remoteDir = targetDir + "/org/mmbase/bridge/remote/";
- File file = new File(remoteDir);
- if (!file.exists() || !file.isDirectory()) {
- throw new IllegalArgumentException("directory {" + file.getName()
+ "} does not contain a sub directory org/mmbase/bridge/remote. this is
required for RemoteGenerator to work");
- }
-
- rmiDir = remoteDir + "/rmi/";
- file = new File(rmiDir);
- if (!file.exists()) {
- file.mkdirs();
- }
-
- proxyDir = remoteDir + "/proxy/";
- file = new File(proxyDir);
- if (!file.exists()) {
- file.mkdirs();
- }
+ remoteDir = new File(targetDir + File.separator + "org" +
File.separator + "mmbase" + File.separator + "bridge" + File.separator +
"remote");
+ remoteDir.mkdirs();
+ rmiDir = new File(remoteDir, "rmi");
+ rmiDir.mkdirs();
+ proxyDir = new File(remoteDir, "proxy");
+ proxyDir.mkdirs();
}
Index: RmiGenerator.java
===================================================================
RCS file:
/var/cvs/applications/rmmci/generator/src/org/mmbase/bridge/remote/generator/RmiGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- RmiGenerator.java 16 Jul 2008 13:28:20 -0000 1.2
+++ RmiGenerator.java 20 Feb 2009 14:01:18 -0000 1.3
@@ -11,6 +11,7 @@
package org.mmbase.bridge.remote.generator;
import java.lang.reflect.*;
+import java.io.File;
/**
@@ -18,7 +19,7 @@
*
* @since MMBase-1.9
* @author Pierre van Rooden
- * @version $Id: RmiGenerator.java,v 1.2 2008/07/16 13:28:20 michiel Exp $
+ * @version $Id: RmiGenerator.java,v 1.3 2009/02/20 14:01:18 michiel Exp $
*/
public class RmiGenerator extends AbstractClassGenerator {
@@ -220,10 +221,9 @@
buffer.append(" }\n\n");
}
- public void generate(String rmiDir) {
+ public void generate(File rmiDir) {
generate();
- String filename = rmiDir + rmiName + ".java";
- writeSourceFile(filename);
+ writeSourceFile(new File(rmiDir, rmiName + ".java"));
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
