Add set-name

Author: qiemem

src/main/ChildModel.java

@@ -25,9 +25,12 @@ public abstract class ChildModel {
     private Procedure reporterRunner;
     private Procedure commandRunner;
     private LoadingCache<String, Reporter> tasks;
+    private String name;
+    private int modelID;
 
-    public ChildModel(World parentWorld) throws ExtensionException {
+    public ChildModel(World parentWorld, int modelID) throws ExtensionException {
         this.parentWorld = parentWorld;
+        this.modelID = modelID;
 
         tasks = CacheBuilder.newBuilder().build(new CacheLoader<String, Reporter>() {
             @Override
@@ -46,6 +49,7 @@ public Reporter load(String code) throws ExtensionException {
      * @throws ExtensionException
      */
     void init() throws ExtensionException {
+        setName(workspace().getModelFileName());
         try {
             reporterRunner = workspace().compileReporter("runresult task [ 0 ]");
             commandRunner = workspace().compileCommands("run task []");
@@ -152,8 +156,19 @@ public String getPath() {
         return workspace().getModelPath();
     }
 
+    String getFrameTitle() {
+        return name + " (LevelSpace model #" + modelID + ")";
+    }
+
     public String getName() {
-        return workspace().modelNameForDisplay();
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+        if (this.frame() != null) {
+            this.frame().setTitle(getFrameTitle());
+        }
     }
 
     abstract public void setSpeed(double d);

src/main/GUIChildModel.java

@@ -14,14 +14,12 @@ public class GUIChildModel extends ChildModel {
 
     final JFrame frame = new JFrame();
     InterfaceComponent component;
-    int levelsSpaceNumber;
     GUIPanel panel;
 
 
     public GUIChildModel(World parentWorld, final String path, final int levelsSpaceNumber)
             throws InterruptedException, ExtensionException, HaltException {
-        super(parentWorld);
-        this.levelsSpaceNumber = levelsSpaceNumber;
+        super(parentWorld, levelsSpaceNumber);
 
         component = runUISafely(new Callable<InterfaceComponent>() {
             public InterfaceComponent call() throws Exception {
@@ -43,7 +41,6 @@ public InterfaceComponent call() throws Exception {
                         ((SpeedSliderPanel) co).setValue(0);
                     }
                 }
-                frame.setTitle(component.workspace().getModelFileName() + " (LevelsSpace model-id: " + String.valueOf(levelsSpaceNumber) + ")");
                 frame.pack();
                 // Make sure that the model doesn't close if people accidentally click the close button
                 frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);

src/main/HeadlessChildModel.java

@@ -13,11 +13,9 @@ public class HeadlessChildModel extends ChildModel {
 
     HeadlessWorkspace myWS;
     ImageFrame frame;
-    int levelsSpaceNumber;
 
     public HeadlessChildModel(World parentWorld, String path, final int levelsSpaceNumber) throws IOException, CompilerException, LogoException, ExtensionException {
-        super(parentWorld);
-        this.levelsSpaceNumber = levelsSpaceNumber;
+        super(parentWorld, levelsSpaceNumber);
         myWS = HeadlessWorkspace.newInstance();
         myWS.open(path);
         init();
@@ -30,8 +28,7 @@ private void ensureImageFrame() {
                     @Override
                     public ImageFrame call() throws Exception {
                         final BufferedImage bi = myWS.exportView();
-                        final String aTitle = getName().concat(" (LevelsSpace Model No. ").concat(Integer.toString(levelsSpaceNumber)).concat(")");
-                        return new ImageFrame(bi, aTitle);
+                        return new ImageFrame(myWS.exportView(), getFrameTitle());
                     }
                 });
             } catch (Exception e) {

src/main/LevelsSpace.java

@@ -63,6 +63,7 @@ public void load(PrimitiveManager primitiveManager) throws ExtensionException {
         primitiveManager.addPrimitive("load-headless-model", new LoadModel<HeadlessChildModel>(HeadlessChildModel.class));
         primitiveManager.addPrimitive("load-gui-model", new LoadModel<GUIChildModel>(GUIChildModel.class));
         primitiveManager.addPrimitive("name-of", new ModelName());
+        primitiveManager.addPrimitive("set-name", new SetName());
         primitiveManager.addPrimitive("close", new CloseModel());
         primitiveManager.addPrimitive("models", new AllModels());
         primitiveManager.addPrimitive("model-exists?", new ModelExists());
@@ -452,13 +453,23 @@ public static class ModelName extends DefaultReporter{
         public Syntax getSyntax(){
             return Syntax.reporterSyntax(new int[] {Syntax.NumberType()},
                     Syntax.StringType());
-
         }
         public Object report(Argument[] args, Context context) throws ExtensionException, LogoException {
             int modelNumber = args[0].getIntValue();
             return getModel(modelNumber).getName();
         }
+    }
+
+    public static class SetName extends DefaultCommand {
 
+        @Override
+        public Syntax getSyntax() {
+            return Syntax.commandSyntax(new int[] {Syntax.NumberType(), Syntax.StringType()});
+        }
+        @Override
+        public void perform(Argument[] args, Context context) throws LogoException, ExtensionException {
+            getModel(args[0].getIntValue()).setName(args[1].getString());
+        }
     }
 
     // this returns the path of the model

tests.txt

@@ -56,3 +56,9 @@ ls-*-descendant-works-for-one-item-list
   O> ls:load-headless-model "Blank.nlogo"
   O> ls:ask-descendant [0] "crt 1"
   "count turtles" ls:of-descendant [0] => 1
+
+ls-set-name
+  extensions [ ls ]
+  O> ls:load-headless-model "Blank.nlogo"
+  O> ls:set-name 0 "foo"
+  ls:name-of 0 => "foo"