[or-cvs] r15691: Change Factory method names to reflect the earlier changes (in puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi: . execute impl)
sebastian at seul.org
sebastian at seul.org
Sun Jul 6 14:18:37 UTC 2008
Author: sebastian
Date: 2008-07-06 10:18:37 -0400 (Sun, 06 Jul 2008)
New Revision: 15691
Modified:
puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/AbstractMasterFactory.java
puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/AbstractSlaveFactory.java
puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/Master.java
puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/execute/PuppeTorMasterProgram.java
puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/execute/PuppeTorSlaveProgram.java
puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/impl/MasterImplFactory.java
puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/impl/SlaveImplFactory.java
Log:
Change Factory method names to reflect the earlier changes
Modified: puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/AbstractMasterFactory.java
===================================================================
--- puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/AbstractMasterFactory.java 2008-07-06 13:59:36 UTC (rev 15690)
+++ puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/AbstractMasterFactory.java 2008-07-06 14:18:37 UTC (rev 15691)
@@ -75,7 +75,7 @@
* Create the server represantation for this connected slave
* @return The new <code>RemotePuppeTor</code> instance
*/
- public abstract Master createPuppeTorMaster(Slave slave)
+ public abstract Master createMaster(Slave slave)
throws RemoteException;
/**
Modified: puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/AbstractSlaveFactory.java
===================================================================
--- puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/AbstractSlaveFactory.java 2008-07-06 13:59:36 UTC (rev 15690)
+++ puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/AbstractSlaveFactory.java 2008-07-06 14:18:37 UTC (rev 15691)
@@ -78,7 +78,7 @@
*
* @return The new <code>Slave</code> instance
*/
- public abstract Slave createPuppeTorSlave(final String slaveName,
+ public abstract Slave createSlave(final String slaveName,
final OS os, final String ip, final Set<Integer> ports,
final Set<Integer> availableRevisions) throws NullPointerException;
}
Modified: puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/Master.java
===================================================================
--- puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/Master.java 2008-07-06 13:59:36 UTC (rev 15690)
+++ puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/Master.java 2008-07-06 14:18:37 UTC (rev 15691)
@@ -31,6 +31,11 @@
*/
package de.uniba.wiai.lspi.puppetor.rmi;
-public interface Master {
-
-}
+/**
+ * Any subclass implementing this must also implement <code>RemoteMaster</code>
+ * and <code>LocalMaster</code>.
+ * XXX This isn't a good way to do it. Think about it more later-SH
+ *
+ * @author Sebastian Hahn
+ */
+public interface Master {}
Modified: puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/execute/PuppeTorMasterProgram.java
===================================================================
--- puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/execute/PuppeTorMasterProgram.java 2008-07-06 13:59:36 UTC (rev 15690)
+++ puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/execute/PuppeTorMasterProgram.java 2008-07-06 14:18:37 UTC (rev 15691)
@@ -162,7 +162,7 @@
throws RemoteException {
final AbstractMasterFactory fact =
AbstractMasterFactory.getInstance();
- final Master master = fact.createPuppeTorMaster(slave);
+ final Master master = fact.createMaster(slave);
((LocalMaster)master).registerWithTestExecutor();
return (RemoteMaster)master;
}
Modified: puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/execute/PuppeTorSlaveProgram.java
===================================================================
--- puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/execute/PuppeTorSlaveProgram.java 2008-07-06 13:59:36 UTC (rev 15690)
+++ puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/execute/PuppeTorSlaveProgram.java 2008-07-06 14:18:37 UTC (rev 15691)
@@ -158,7 +158,7 @@
final Set<Integer> availableRevisions =
new CopyOnWriteArraySet<Integer>();
slave =
- fac.createPuppeTorSlave(slaveName, Slave.OS.UNDEFINED,
+ fac.createSlave(slaveName, Slave.OS.UNDEFINED,
"127.0.0.1", ports, availableRevisions);
}
Modified: puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/impl/MasterImplFactory.java
===================================================================
--- puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/impl/MasterImplFactory.java 2008-07-06 13:59:36 UTC (rev 15690)
+++ puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/impl/MasterImplFactory.java 2008-07-06 14:18:37 UTC (rev 15691)
@@ -45,7 +45,7 @@
public class MasterImplFactory extends AbstractMasterFactory {
@Override
- public Master createPuppeTorMaster(final Slave slave)
+ public Master createMaster(final Slave slave)
throws RemoteException {
return new MasterImpl(slave);
}
Modified: puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/impl/SlaveImplFactory.java
===================================================================
--- puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/impl/SlaveImplFactory.java 2008-07-06 13:59:36 UTC (rev 15690)
+++ puppetor/branches/gsoc2008/src/de/uniba/wiai/lspi/puppetor/rmi/impl/SlaveImplFactory.java 2008-07-06 14:18:37 UTC (rev 15691)
@@ -48,7 +48,7 @@
* @return a new <code>RemotePuppeTorImpl</code> instance.
*/
@Override
- public Slave createPuppeTorSlave(final String slaveName,
+ public Slave createSlave(final String slaveName,
final OS os, final String ip, final Set<Integer> ports,
final Set<Integer> availableRevisions) throws NullPointerException {
System.out.println(slaveName);
More information about the tor-commits
mailing list