Mercurial > hg > Database > Christie
changeset 234:665d56665b7e
add renew
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/scripts/Log/star.dot Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,8 @@ +digraph test { + node0 -> node1 [label="node1"] + node0 -> node2 [label="node2"] + node1 -> node0 [label="server"] + node1 -> node2 [label="partner"] + node2 -> node0 [label="server"] + node2 -> node1 [label="partner"] +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/protoRemotingTextEditor/CatchDG.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,31 @@ +package christie.protoRemotingTextEditor; + +import christie.annotation.Peek; +import christie.annotation.Take; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.topology.Message; +import christie.topology.TopologyDataGear; + +public class CatchDG extends CodeGear { + @Take + Message say; + + @Peek + TopologyDataGear topoDG; + + @Override + protected void run(CodeGearManager cgm) { + System.out.println("Start"); + +// while(TextFrame.SendPermission() == false){ +// try{ +// Thread.sleep(1); +// }catch(InterruptedException e){ +// +// } +// } + System.out.println(topoDG.getNodeName()); + + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/protoRemotingTextEditor/GetOpponentMessage.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,32 @@ +package christie.protoRemotingTextEditor; + +import christie.annotation.Peek; +import christie.annotation.Take; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.textEditor.NewTextEditor; +import christie.topology.Message; +import christie.topology.TopologyDataGear; + +public class GetOpponentMessage extends CodeGear { + @Take + int offset; + + @Take + Message string; + + @Peek + NewTextEditor myEditor; + + @Peek + TopologyDataGear topoDG; + + + @Override + protected void run(CodeGearManager cgm) { + System.out.println( topoDG.getNodeName() + "get Message"); + myEditor.prohibitDL(); +// myEditor.insertMessage(offset, string); + cgm.setup(new GetOpponentMessage()); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/protoRemotingTextEditor/ManToManNodeConfig.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,15 @@ +package christie.protoRemotingTextEditor; + +import christie.topology.node.TopologyNodeConfig; + +public class ManToManNodeConfig extends TopologyNodeConfig { + + public ManToManNodeConfig(String[] args) { + super(args); + for (int j = 0; j< args.length; j++) { + if ("--totalNodeNum".equals(args[j])) { + + } + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/protoRemotingTextEditor/NodeStart.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,13 @@ +package christie.protoRemotingTextEditor; + + +import christie.topology.node.StartTopologyNode; +import christie.topology.node.TopologyNodeConfig; + +public class NodeStart { + public static void main(String[] args){ + ManToManNodeConfig manToManNodeConfig = new ManToManNodeConfig(args); + + StartTopologyNode startTopologyNode = new StartTopologyNode((TopologyNodeConfig) manToManNodeConfig, new SetInstance()); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/protoRemotingTextEditor/SetEditorCommunication.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,37 @@ +package christie.protoRemotingTextEditor; + +import christie.annotation.Peek; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.textEditor.NewTextEditor; +import christie.topology.Message; +import christie.topology.TopologyDataGear; + +public class SetEditorCommunication extends CodeGear { + @Peek + TopologyDataGear topoDG; + + @Peek + NewTextEditor myEditor; + + @Override + protected void run(CodeGearManager cgm) { +// System.out.println(topoDG.getNodeName()); + if(myEditor.checkPermission() == true) { + int sendOffset = myEditor.returnOffset(); + String sendString = myEditor.returnString(); + System.out.println(topoDG.getNodeName() + ":catchoffset=: " + sendOffset); + myEditor.changeToFalseSendPermmision(); + put("opponent", "offset", sendOffset); + put("opponent", "string", new Message()); + //opponentは単語として不適切。 + //insert,deleteなどの命令を飛ばす。その中にoffset,stringが含まれる。コマンドパターン。 + //get,setの単語は紛らわしいのでよくない。 + cgm.setup(new SetEditorCommunication()); + }else{ + cgm.setup(new SetEditorCommunication()); + } + + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/protoRemotingTextEditor/SetInstance.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,48 @@ +package christie.protoRemotingTextEditor; + +import christie.annotation.Peek; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.textEditor.*; +import christie.topology.TopologyDataGear; + + +public class SetInstance extends CodeGear { + + @Peek + TopologyDataGear topoDG; + + protected void run(CodeGearManager cgm) { + + System.out.println("I am " + topoDG.getNodeName()); + if(topoDG.getNodeName().equals("node0")) { + NewTextEditor Editor0 = new NewTextEditor(); + Editor0.StartEditor(topoDG.getNodeName()); + System.out.println("node0"); + cgm.setup(new SetEditorCommunication()); + cgm.getLocalDGM().put("myEditor", Editor0); + cgm.setup(new GetOpponentMessage()); + + }else if(topoDG.getNodeName().equals("node1")){ + NewTextEditor Editor1 = new NewTextEditor(); + Editor1.StartEditor(topoDG.getNodeName()); + System.out.println("node1"); + cgm.setup(new SetEditorCommunication()); + cgm.getLocalDGM().put("myEditor", Editor1); + cgm.setup(new GetOpponentMessage()); + } + //cgm.setup(new CatchDG()); + + + /* + while(myEditor.SendPermission() == false){ + try{ + Thread.sleep(1); + }catch(InterruptedException e){ + + } + } + System.out.println("catch"); + */ + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/protoRemotingTextEditor/StartManToManSession.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,34 @@ +package christie.protoRemotingTextEditor; + +import christie.codegear.CodeGearManager; +import christie.codegear.StartCodeGear; +import christie.topology.manager.StartTopologyManager; +import christie.topology.manager.TopologyManagerConfig; + +public class StartManToManSession extends StartCodeGear { + + public StartManToManSession(CodeGearManager cgm) { + super(cgm); + } + + public static void main(String[] args){ + int TopologyManagerPort = 10000; + int TopologyNodePort = 10001; + + String[] managerArg = {"--localPort", String.valueOf(TopologyManagerPort), "--confFile", "scripts/Log/manToMan.dot"}; + + TopologyManagerConfig topologyManagerConfig = new TopologyManagerConfig(managerArg); + new StartTopologyManager(topologyManagerConfig); + + + for (int i = 0; i <= 1; i++){ + String[] nodeArg = {"--managerPort", String.valueOf(TopologyManagerPort), + "--managerHost", "localhost", + "--localPort", String.valueOf(TopologyNodePort + i), + }; + + NodeStart.main(nodeArg); + + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/protoRemotingTextEditor/StartTwoEditor.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,27 @@ +package christie.protoRemotingTextEditor; + +import christie.codegear.CodeGearManager; +import christie.codegear.StartCodeGear; +import christie.textEditor.NewTextEditor; + +public class StartTwoEditor extends StartCodeGear{ + public StartTwoEditor(CodeGearManager cgm) { + super(cgm); + } + + public static void main(String[] args){ + NewTextEditor ed1 = new NewTextEditor(); + NewTextEditor ed2 = new NewTextEditor(); + + + + + /* + CodeGearManager editor1 = createCGM(10001); + CodeGearManager editor2 = createCGM(10002); + editor1.createRemoteDGM("editor2","localhost",10002); + editor1.setup(new SetInstance()); + editor2.setup(new SetInstance()); + */ + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/remoteTextEditor/CheckCommand.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,37 @@ +package christie.remoteTextEditor; + +import christie.annotation.Peek; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.textEditor.NewTextEditor; +import christie.topology.Message; +import christie.topology.TopologyDataGear; +import christie.remoteTextEditor.Insert; +import christie.remoteTextEditor.Command; + +public class CheckCommand extends CodeGear { + @Peek + TopologyDataGear topoDG; + + @Peek + NewTextEditor myEditor; + + @Override + protected void run(CodeGearManager cgm) { + int sendOffset; + String sendString; + if(myEditor.checkPermission() == true) { + Command cmd = new Insert(myEditor.returnOffset(), myEditor.returnString()); + myEditor.changeToFalseSendPermmision(); + put("opponent", "cmd", new Message()); + System.out.println(topoDG.getNodeName() + " :catch,offset = " + myEditor.returnOffset()); + +// opponentは単語として不適切。 +// insert,deleteなどの命令を飛ばす。その中にoffset,stringが含まれる。コマンドパターン。 +// get,setの単語は紛らわしいのでよくない。 + cgm.setup(new CheckCommand()); + }else{ + cgm.setup(new CheckCommand()); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/remoteTextEditor/CheckMyName.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,19 @@ +package christie.remoteTextEditor; + +import christie.annotation.Peek; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.topology.TopologyDataGear; + +public class CheckMyName extends CodeGear { + @Peek + TopologyDataGear topoDG; + + protected void run(CodeGearManager cgm) { + if(topoDG.getNodeName().equals("node3")){ + cgm.setup(new StartServer()); + }else{ + cgm.setup(new MakeInstance()); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/remoteTextEditor/Command.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,7 @@ +package christie.remoteTextEditor; + +import christie.textEditor.NewTextEditor; + +public interface Command { + public abstract void execute(NewTextEditor myEditor); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/remoteTextEditor/Insert.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,26 @@ +package christie.remoteTextEditor; + +import christie.textEditor.NewTextEditor; +import christie.remoteTextEditor.Command; + +public class Insert implements Command { + String string; + + int fastOffset; + + int endOffset; + + NewTextEditor myEditor; + + public Insert(int fastOffset, String string){ + this.string = string; + this.fastOffset = fastOffset; + } + + + @Override + public void execute(NewTextEditor myEditor) { + this.myEditor = myEditor; + myEditor.insertMessage(this.fastOffset, this.string); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/remoteTextEditor/MakeInstance.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,22 @@ +package christie.remoteTextEditor; + +import christie.annotation.Peek; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.textEditor.NewTextEditor; +import christie.topology.Message; +import christie.topology.TopologyDataGear; + +public class MakeInstance extends CodeGear { + @Peek + TopologyDataGear topoDG; + + protected void run(CodeGearManager cgm) { + NewTextEditor Editor = new NewTextEditor(); + Editor.StartEditor(topoDG.getNodeName()); + cgm.setup(new CheckCommand()); + cgm.getLocalDGM().put("myEditor", Editor); + cgm.setup(new receiveCommand()); + + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/remoteTextEditor/RemoteNodeConfig.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,18 @@ +package christie.remoteTextEditor; + +import christie.topology.node.TopologyNodeConfig; + +public class RemoteNodeConfig extends TopologyNodeConfig { + + public RemoteNodeConfig(String[] args) { + super(args); + + + for (int j = 0; j < args.length; j++) { + if ("--totalNodeNum".equals(args[j])) { + + } + + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/remoteTextEditor/RemoteNodeStart.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,14 @@ +package christie.remoteTextEditor; + + +import christie.topology.node.StartTopologyNode; +import christie.topology.node.TopologyNodeConfig; + +public class RemoteNodeStart { + public static void main(String[] args){ + RemoteNodeConfig remoteNodeConfig = new RemoteNodeConfig(args); + + StartTopologyNode startTopologyNode = new StartTopologyNode((TopologyNodeConfig) remoteNodeConfig, new CheckMyName()); + + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/remoteTextEditor/StartRemotingTextEditor.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,33 @@ +package christie.remoteTextEditor; + +import christie.codegear.CodeGearManager; +import christie.codegear.StartCodeGear; +import christie.topology.manager.StartTopologyManager; +import christie.topology.manager.TopologyManagerConfig; + +public class StartRemotingTextEditor extends StartCodeGear { + + public StartRemotingTextEditor(CodeGearManager cgm) { + super(cgm); + } + + public static void main(String[] args){ + int TopologyManagerPort = 10000; + int TopologyNodePort = 10001; + + String[] managerArg = {"--localPort", String.valueOf(TopologyManagerPort), "--confFile", "scripts/Log/star.dot"}; + + TopologyManagerConfig topologyManagerConfig = new TopologyManagerConfig(managerArg); + new StartTopologyManager(topologyManagerConfig); + + + for (int i = 0; i <= 1; i++){ + String[] nodeArg = {"--managerPort", String.valueOf(TopologyManagerPort), + "--managerHost", "localhost", + "--localPort", String.valueOf(TopologyNodePort + i), + }; + + RemoteNodeStart.main(nodeArg); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/remoteTextEditor/StartServer.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,16 @@ +package christie.remoteTextEditor; + +import christie.annotation.Peek; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.topology.TopologyDataGear; + +public class StartServer extends CodeGear { + @Peek + TopologyDataGear topoDG; + + @Override + protected void run(CodeGearManager cgm) { + System.out.println("Server"); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/christie/remoteTextEditor/receiveCommand.java Tue Jan 21 19:05:04 2020 +0900 @@ -0,0 +1,24 @@ +package christie.remoteTextEditor; + +import christie.annotation.Peek; +import christie.annotation.Take; +import christie.codegear.CodeGear; +import christie.codegear.CodeGearManager; +import christie.textEditor.NewTextEditor; +import christie.remoteTextEditor.Insert; +import christie.remoteTextEditor.Command; +import org.msgpack.annotation.Message; + +public class receiveCommand extends CodeGear { + @Take + Message cmd; + + @Peek + NewTextEditor myEditor; + + @Override + protected void run(CodeGearManager cgm) { +// cmd.execute(myEditor); + System.out.println("キャッチ"); + } +}
--- a/src/main/java/christie/remotingTextEditor/CatchDG.java Fri Dec 27 18:18:04 2019 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -package christie.remotingTextEditor; - -import christie.annotation.Peek; -import christie.annotation.Take; -import christie.codegear.CodeGear; -import christie.codegear.CodeGearManager; -import christie.textEditor.TextFrame; -import christie.topology.Message; -import christie.topology.TopologyDataGear; - -public class CatchDG extends CodeGear { - @Take - Message say; - - @Peek - TopologyDataGear topoDG; - - @Override - protected void run(CodeGearManager cgm) { - System.out.println("Start"); - -// while(TextFrame.SendPermission() == false){ -// try{ -// Thread.sleep(1); -// }catch(InterruptedException e){ -// -// } -// } - System.out.println(topoDG.getNodeName()); - - } -}
--- a/src/main/java/christie/remotingTextEditor/GetOpponentMessage.java Fri Dec 27 18:18:04 2019 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -package christie.remotingTextEditor; - -import christie.annotation.Peek; -import christie.annotation.Take; -import christie.codegear.CodeGear; -import christie.codegear.CodeGearManager; -import christie.textEditor.NewTextEditor; -import christie.topology.Message; -import christie.topology.TopologyDataGear; - -public class GetOpponentMessage extends CodeGear { - @Take - int offset; - - @Take - String string; - - @Peek - NewTextEditor myEditor; - - @Peek - TopologyDataGear topoDG; - - - @Override - protected void run(CodeGearManager cgm) { - System.out.println( topoDG.getNodeName() + " gave:" + string + " on " + offset); - myEditor.prohibitDL(); - myEditor.insertMessage(offset, string); - cgm.setup(new GetOpponentMessage()); - } -}
--- a/src/main/java/christie/remotingTextEditor/ManToManNodeConfig.java Fri Dec 27 18:18:04 2019 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -package christie.remotingTextEditor; - -import christie.topology.node.TopologyNodeConfig; - -public class ManToManNodeConfig extends TopologyNodeConfig { - - public ManToManNodeConfig(String[] args) { - super(args); - for (int j = 0; j< args.length; j++) { - if ("--totalNodeNum".equals(args[j])) { - - } - } - } -}
--- a/src/main/java/christie/remotingTextEditor/NodeStart.java Fri Dec 27 18:18:04 2019 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -package christie.remotingTextEditor; - - -import christie.topology.node.StartTopologyNode; -import christie.topology.node.TopologyNodeConfig; - -public class NodeStart { - public static void main(String[] args){ - ManToManNodeConfig manToManNodeConfig = new ManToManNodeConfig(args); - - StartTopologyNode startTopologyNode = new StartTopologyNode((TopologyNodeConfig) manToManNodeConfig, new SetInstance()); - } -}
--- a/src/main/java/christie/remotingTextEditor/SetEditorCommunication.java Fri Dec 27 18:18:04 2019 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -package christie.remotingTextEditor; - -import christie.annotation.Peek; -import christie.codegear.CodeGear; -import christie.codegear.CodeGearManager; -import christie.textEditor.NewTextEditor; -import christie.topology.Message; -import christie.topology.TopologyDataGear; - -public class SetEditorCommunication extends CodeGear { - @Peek - TopologyDataGear topoDG; - - @Peek - NewTextEditor myEditor; - - @Override - protected void run(CodeGearManager cgm) { -// System.out.println(topoDG.getNodeName()); - while(myEditor.checkPermission() == false){ - try{ - Thread.sleep(1); - }catch(InterruptedException e){ - - } - } - int sendOffset = myEditor.getOffset(); - String sendString = myEditor.getString(); - System.out.println(topoDG.getNodeName()+ ":catchoffset=: " + sendOffset); - myEditor.changeToFalseSendPermmision(); - put("opponent", "offset", sendOffset); - put("opponent", "string", sendString); - cgm.setup(new SetEditorCommunication()); - - } - -}
--- a/src/main/java/christie/remotingTextEditor/SetInstance.java Fri Dec 27 18:18:04 2019 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,59 +0,0 @@ -package christie.remotingTextEditor; - -import christie.annotation.Peek; -import christie.annotation.Take; -import christie.codegear.CodeGear; -import christie.codegear.CodeGearManager; - -import javax.swing.*; -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; -import javax.swing.text.*; -import christie.textEditor.*; -import christie.topology.Message; -import christie.topology.TopologyDataGear; - -import java.io.FileWriter; - -import static christie.codegear.StartCodeGear.createCGM; - - -public class SetInstance extends CodeGear { - - @Peek - TopologyDataGear topoDG; - - protected void run(CodeGearManager cgm) { - - System.out.println("I am " + topoDG.getNodeName()); - if(topoDG.getNodeName().equals("node0")) { - NewTextEditor Editor0 = new NewTextEditor(); - Editor0.StartEditor(topoDG.getNodeName()); - System.out.println("node0"); - cgm.setup(new SetEditorCommunication()); - cgm.getLocalDGM().put("myEditor", Editor0); - cgm.setup(new GetOpponentMessage()); - - }else if(topoDG.getNodeName().equals("node1")){ - NewTextEditor Editor1 = new NewTextEditor(); - Editor1.StartEditor(topoDG.getNodeName()); - System.out.println("node1"); - cgm.setup(new SetEditorCommunication()); - cgm.getLocalDGM().put("myEditor", Editor1); - cgm.setup(new GetOpponentMessage()); - } - //cgm.setup(new CatchDG()); - - - /* - while(myEditor.SendPermission() == false){ - try{ - Thread.sleep(1); - }catch(InterruptedException e){ - - } - } - System.out.println("catch"); - */ - } -}
--- a/src/main/java/christie/remotingTextEditor/StartManToManSession.java Fri Dec 27 18:18:04 2019 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -package christie.remotingTextEditor; - -import christie.codegear.CodeGearManager; -import christie.codegear.StartCodeGear; -import christie.topology.manager.StartTopologyManager; -import christie.topology.manager.TopologyManagerConfig; - -public class StartManToManSession extends StartCodeGear { - - public StartManToManSession(CodeGearManager cgm) { - super(cgm); - } - - public static void main(String[] args){ - int TopologyManagerPort = 10000; - int TopologyNodePort = 10001; - - String[] managerArg = {"--localPort", String.valueOf(TopologyManagerPort), "--confFile", "scripts/Log/manToMan.dot"}; - - TopologyManagerConfig topologyManagerConfig = new TopologyManagerConfig(managerArg); - new StartTopologyManager(topologyManagerConfig); - - - for (int i = 0; i <= 1; i++){ - String[] nodeArg = {"--managerPort", String.valueOf(TopologyManagerPort), - "--managerHost", "localhost", - "--localPort", String.valueOf(TopologyNodePort + i), - }; - - NodeStart.main(nodeArg); - - } - } -}
--- a/src/main/java/christie/remotingTextEditor/StartTwoEditor.java Fri Dec 27 18:18:04 2019 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -package christie.remotingTextEditor; - -import christie.codegear.CodeGear; -import christie.codegear.CodeGearManager; -import christie.codegear.StartCodeGear; -import christie.textEditor.NewTextEditor; - -public class StartTwoEditor extends StartCodeGear{ - public StartTwoEditor(CodeGearManager cgm) { - super(cgm); - } - - public static void main(String[] args){ - NewTextEditor ed1 = new NewTextEditor(); - NewTextEditor ed2 = new NewTextEditor(); - - - - - /* - CodeGearManager editor1 = createCGM(10001); - CodeGearManager editor2 = createCGM(10002); - editor1.createRemoteDGM("editor2","localhost",10002); - editor1.setup(new SetInstance()); - editor2.setup(new SetInstance()); - */ - } -}
--- a/src/main/java/christie/textEditor/NewTextEditor.java Fri Dec 27 18:18:04 2019 +0900 +++ b/src/main/java/christie/textEditor/NewTextEditor.java Tue Jan 21 19:05:04 2020 +0900 @@ -18,11 +18,11 @@ return textFrame.SendPermission(); } - public int getOffset(){ + public int returnOffset(){ return textFrame.returnOffset(); } - public String getString(){return textFrame.returnString();} + public String returnString(){return textFrame.returnString();} public void prohibitDL(){textFrame.prohibitDL();}
--- a/src/main/java/christie/textEditor/textFrame.java Fri Dec 27 18:18:04 2019 +0900 +++ b/src/main/java/christie/textEditor/textFrame.java Tue Jan 21 19:05:04 2020 +0900 @@ -1,8 +1,5 @@ package christie.textEditor; -import christie.codegear.CodeGear; -import christie.remotingTextEditor.SetInstance; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; @@ -13,11 +10,8 @@ import javax.swing.event.DocumentListener; import javax.swing.text.BadLocationException; import javax.swing.text.Document; -import javax.swing.text.StyleConstants; import javax.swing.text.StyleContext; -import static javax.swing.UIManager.put; - public class TextFrame extends JInternalFrame { private JTextArea textArea; @@ -143,18 +137,6 @@ System.out.println("delete " + loc + " to " + del_loc_end); } - - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - try { - doc.insertString(0, "kakikomi", sc.getStyle(StyleContext.DEFAULT_STYLE)); - //System.out.println("string = " + doc.getText(loc, 1)); - } catch (BadLocationException e1) { - e1.printStackTrace(); - } - } - }); } @Override