From 0d2b0b746064b55cf267c63fabc44a95f28273bb Mon Sep 17 00:00:00 2001 From: flanflanagan Date: Sat, 25 Oct 2014 11:17:55 -0500 Subject: [PATCH 001/246] fixes to commodities and quality of life improvements to commodities --- cyclist/src/edu/utexas/cycic/Cycic.java | 21 ++++- .../src/edu/utexas/cycic/CycicCircles.java | 24 ++--- .../utexas/cycic/FormBuilderFunctions.java | 31 +++++-- cyclist/src/edu/utexas/cycic/XMLReader.java | 90 +++++++++++++------ 4 files changed, 116 insertions(+), 50 deletions(-) diff --git a/cyclist/src/edu/utexas/cycic/Cycic.java b/cyclist/src/edu/utexas/cycic/Cycic.java index d5653417..085f2c94 100644 --- a/cyclist/src/edu/utexas/cycic/Cycic.java +++ b/cyclist/src/edu/utexas/cycic/Cycic.java @@ -352,6 +352,7 @@ public void handle(ActionEvent e){ } }); grid.add(imageButton, 2, 1); + opSwitch.getToggles().clear(); opSwitch.getToggles().addAll(localToggle, remoteToggle); try { Process readproc = Runtime.getRuntime().exec("cyclus -V"); @@ -478,18 +479,20 @@ public void buildDnDCircle(FacilityCircle circle, int i, String name){ circle.setFill(Color.web("#CF5300")); circle.setCenterX(45+(i*90)); circle.setCenterY(50); - circle.text.setText(name); + circle.text.setText(name.split(" ")[2]); circle.text.setWrapText(true); circle.text.setMaxWidth(60); circle.text.setLayoutX(circle.getCenterX()-circle.getRadius()*0.7); circle.text.setLayoutY(circle.getCenterY()-circle.getRadius()*0.6); circle.text.setTextAlignment(TextAlignment.CENTER); circle.text.setMouseTransparent(true); + circle.text.setMaxWidth(circle.getRadius()*1.4); + circle.text.setMaxHeight(circle.getRadius()*1.2); circle.setOnDragDetected(new EventHandler(){ public void handle(MouseEvent e){ Dragboard db = circle.startDragAndDrop(TransferMode.COPY); ClipboardContent content = new ClipboardContent(); - content.put(DnD.VALUE_FORMAT, circle.text.getText()); + content.put(DnD.VALUE_FORMAT, name); db.setContent(content); e.consume(); } @@ -527,7 +530,21 @@ public void changed(ObservableValue observable, String oldValu removeCommod.setGraphic(GlyphRegistry.get(AwesomeIcon.TRASH_ALT, "10px")); removeCommod.setOnAction(new EventHandler(){ public void handle(ActionEvent e){ + String commod = Cycic.workingScenario.CommoditiesList.get(index).name.getText(); Cycic.workingScenario.CommoditiesList.remove(index); + for(facilityNode facility: DataArrays.FacilityNodes){ + for(int i =0; i < facility.cycicCircle.incommods.size(); i++){ + if(facility.cycicCircle.incommods.get(i) == commod){ + facility.cycicCircle.incommods.remove(i); + } + } + for(int i =0; i < facility.cycicCircle.outcommods.size(); i++){ + if(facility.cycicCircle.outcommods.get(i) == commod){ + facility.cycicCircle.outcommods.remove(i); + } + } + } + VisFunctions.marketHide(); buildCommodPane(); } }); diff --git a/cyclist/src/edu/utexas/cycic/CycicCircles.java b/cyclist/src/edu/utexas/cycic/CycicCircles.java index 448407cf..cac93ab0 100644 --- a/cyclist/src/edu/utexas/cycic/CycicCircles.java +++ b/cyclist/src/edu/utexas/cycic/CycicCircles.java @@ -124,16 +124,8 @@ public void handle(ActionEvent e){ } }); - final Menu clonesList = new Menu("Children"); + final Menu changeNiche = new Menu("Change Niche"); - /*CustomMenuItem cloneNode = new CustomMenuItem(new Label("Add Child")); - cloneNode.setHideOnClick(false); - cloneNode.setOnAction(new EventHandler(){ - public void handle(ActionEvent e){ - Clones.addClone("", parent, parent.cycicCircle.childrenShow); - } - }); - clonesList.getItems().add(cloneNode);*/ circle.image.setLayoutX(circle.getCenterX()-60); circle.image.setLayoutY(circle.getCenterY()-60); @@ -157,7 +149,7 @@ public void handle(ActionEvent e){ circle.menu.setVisible(false); } }); - menu1.getItems().addAll(facForm, clonesList, delete, showImage, hideImage); + menu1.getItems().addAll(facForm, changeNiche, delete, showImage, hideImage); circle.menu.getMenus().add(menu1); circle.menu.setLayoutX(circle.getCenterX()); circle.menu.setLayoutY(circle.getCenterY()); @@ -297,6 +289,18 @@ public void handle(MouseEvent event){ } }); + circle.setOnMouseEntered(new EventHandler(){ + public void handle(MouseEvent e){ + circle.setRadius(52); + } + }); + + circle.setOnMouseExited(new EventHandler(){ + public void handle(MouseEvent e){ + circle.setRadius(45); + } + }); + // Adding facilityCircle to the pane. Cycic.pane.getChildren().add(circle); Cycic.pane.getChildren().add(circle.menu); diff --git a/cyclist/src/edu/utexas/cycic/FormBuilderFunctions.java b/cyclist/src/edu/utexas/cycic/FormBuilderFunctions.java index cab6242a..5ea86f7e 100644 --- a/cyclist/src/edu/utexas/cycic/FormBuilderFunctions.java +++ b/cyclist/src/edu/utexas/cycic/FormBuilderFunctions.java @@ -265,27 +265,33 @@ static ComboBox comboBoxInCommod(final facilityNode facNode, final Array cb.setMinWidth(80); cb.setOnMousePressed(new EventHandler(){ public void handle(MouseEvent e){ + for(facilityNode facility: DataArrays.FacilityNodes){ + for(int i =0; i < facility.cycicCircle.incommods.size(); i++){ + if(facility.cycicCircle.incommods.get(i) == cb.getValue()){ + facility.cycicCircle.incommods.remove(i); + } + } + } cb.getItems().clear(); - for (CommodityNode label: DataArrays.CommoditiesList){ + for(CommodityNode label: DataArrays.CommoditiesList){ cb.getItems().add(label.name.getText()); } - //cb.getItems().add("New Commodity"); + cb.getItems().add("New Commodity"); - if ( defaultValue.get(0) != "") { + if(!defaultValue.get(0).equals("")) { cb.setValue((String) defaultValue.get(0)); } } }); - if ( defaultValue.get(0) != "") { + if(defaultValue.get(0) != "") { cb.setValue((String) defaultValue.get(0)); } cb.setPromptText("Select a commodity"); cb.valueProperty().addListener(new ChangeListener(){ public void changed(ObservableValue observable, String oldValue, String newValue){ - if (newValue == "New Commodity"){ - // Tell Commodity Window to add a new commodity + Cycic.addNewCommodity(); } else { facNode.cycicCircle.incommods.add(newValue); defaultValue.set(0, newValue); @@ -311,17 +317,24 @@ public void changed(ObservableValue observable, String oldValu * @return ComboBox containing all of the commodities currently linked to markets, with the value shown being the current outcommodity for the facNode. */ static ComboBox comboBoxOutCommod(final facilityNode facNode, final ArrayList defaultValue){ - // Create and fill the comboBox + ///TODO Fix quick hack. final ComboBox cb = new ComboBox(); cb.setMinWidth(80); cb.setOnMousePressed(new EventHandler(){ public void handle(MouseEvent e){ + for(facilityNode facility: DataArrays.FacilityNodes){ + for(int i =0; i < facility.cycicCircle.outcommods.size(); i++){ + if(facility.cycicCircle.outcommods.get(i) == cb.getValue()){ + facility.cycicCircle.outcommods.remove(i); + } + } + } cb.getItems().clear(); for (CommodityNode label: DataArrays.CommoditiesList){ cb.getItems().add(label.name.getText()); } - //cb.getItems().add("New Commodity"); + cb.getItems().add("New Commodity"); if (defaultValue.get(0) != "") { cb.setValue((String) defaultValue.get(0)); @@ -335,7 +348,7 @@ public void handle(MouseEvent e){ cb.valueProperty().addListener(new ChangeListener(){ public void changed(ObservableValue observable, String oldValue, String newValue){ if (newValue == "New Commodity"){ - // Tell Commodity Window to add a new commodity + Cycic.addNewCommodity(); } else { facNode.cycicCircle.outcommods.add(newValue); defaultValue.set(0, newValue); diff --git a/cyclist/src/edu/utexas/cycic/XMLReader.java b/cyclist/src/edu/utexas/cycic/XMLReader.java index f02f55d6..25080a8b 100644 --- a/cyclist/src/edu/utexas/cycic/XMLReader.java +++ b/cyclist/src/edu/utexas/cycic/XMLReader.java @@ -211,35 +211,7 @@ static void combiner(ArrayList dataArray, JsonObject json){ } cycicResize(dataArray); if(dataArray.get(2) == "oneOrMore" || dataArray.get(2) == "zeroOrMore" ){ - cycicResize((ArrayList) ((ArrayList) dataArray.get(1)).get(0)); - if(json_pass.get("uitype") instanceof JsonArray){ - JsonArray array = json_pass.getJsonArray("uitype"); - for(int i = 0; i < ((ArrayList) dataArray.get(1)).size(); i++){ - String string = array.get(i+1).toString().replaceAll("\"", ""); - cycicResize((ArrayList) ((ArrayList) dataArray.get(1)).get(i)); - ((ArrayList) ((ArrayList) dataArray.get(1)).get(i)).set(2, string); - } - } else if(json_pass.get("uitype") != null){ - ((ArrayList) ((ArrayList) dataArray.get(1)).get(0)).set(2, json_pass.get("uitype").toString().replace("\"", "")); - } - if(json_pass.get("default") instanceof JsonArray){ - JsonArray array = json_pass.getJsonArray("default"); - for(int i = 0; i < ((ArrayList) dataArray.get(1)).size(); i++){ - String string = array.get(i+1).toString().replaceAll("\"", ""); - cycicResize((ArrayList) ((ArrayList) dataArray.get(1)).get(i)); - ((ArrayList) ((ArrayList) dataArray.get(1)).get(i)).set(2, string); - } - } else if(json_pass.get("default") instanceof JsonObject){ - JsonObject object = json_pass.getJsonObject("default"); - Set keys = object.keySet(); - for(int i = 0; i < ((ArrayList) dataArray.get(1)).size(); i++){ - cycicResize((ArrayList) ((ArrayList) dataArray.get(1)).get(i)); - } - ((ArrayList) ((ArrayList) dataArray.get(1)).get(0)).set(5, keys.toArray()[0].toString()); - ((ArrayList) ((ArrayList) dataArray.get(1)).get(1)).set(5, object.get(keys.toArray()[0]).toString()); - } else if(json_pass.get("default") != null) { - - } + orMoreInfoControl(json_pass, dataArray); //cycicInfoControl(json_pass, (ArrayList) ((ArrayList) dataArray.get(1)).get(0)); } combiner((ArrayList)dataArray.get(1), json); @@ -371,7 +343,67 @@ static ArrayList nodeListener(Node node, ArrayList array){ return array; } + /** + * + * @param jsonPass + * @param dataArray + * @return + */ + @SuppressWarnings("unchecked") static ArrayList orMoreInfoControl(JsonObject jsonPass, ArrayList dataArray){ + cycicResize((ArrayList) ((ArrayList) dataArray.get(1)).get(0)); + + if(jsonPass.get("uitype") instanceof JsonArray){ + JsonArray array = jsonPass.getJsonArray("uitype"); + for(int i = 0; i < ((ArrayList) dataArray.get(1)).size(); i++){ + String string = array.get(i+1).toString().replaceAll("\"", ""); + cycicResize((ArrayList) ((ArrayList) dataArray.get(1)).get(i)); + ((ArrayList) ((ArrayList) dataArray.get(1)).get(i)).set(2, string); + } + } else if(jsonPass.get("uitype") != null){ + ((ArrayList) ((ArrayList) dataArray.get(1)).get(0)).set(2, jsonPass.get("uitype").toString().replace("\"", "")); + } + + if(jsonPass.get("uilabel") instanceof JsonArray){ + JsonArray array = jsonPass.getJsonArray("uilabel"); + for(int i = 0; i < ((ArrayList) dataArray.get(1)).size(); i++){ + String string = array.get(i+1).toString().replaceAll("\"", ""); + cycicResize((ArrayList) ((ArrayList) dataArray.get(1)).get(i)); + ((ArrayList) ((ArrayList) dataArray.get(1)).get(i)).set(9, string); + } + } else if(jsonPass.get("uilabel") != null){ + ((ArrayList) ((ArrayList) dataArray.get(1)).get(0)).set(9, jsonPass.get("uilabel").toString().replace("\"", "")); + } + + if(jsonPass.get("tooltip") instanceof JsonArray){ + JsonArray array = jsonPass.getJsonArray("tooltip"); + for(int i = 0; i < ((ArrayList) dataArray.get(1)).size(); i++){ + String string = array.get(i+1).toString().replaceAll("\"", ""); + cycicResize((ArrayList) ((ArrayList) dataArray.get(1)).get(i)); + ((ArrayList) ((ArrayList) dataArray.get(1)).get(i)).set(7, string); + } + } else if(jsonPass.get("tooltip") != null){ + ((ArrayList) ((ArrayList) dataArray.get(1)).get(0)).set(7, jsonPass.get("tooltip").toString().replace("\"", "")); + } + + if(jsonPass.get("default") instanceof JsonArray){ + JsonArray array = jsonPass.getJsonArray("default"); + for(int i = 0; i < ((ArrayList) dataArray.get(1)).size(); i++){ + String string = array.get(i+1).toString().replaceAll("\"", ""); + cycicResize((ArrayList) ((ArrayList) dataArray.get(1)).get(i)); + ((ArrayList) ((ArrayList) dataArray.get(1)).get(i)).set(2, string); + } + } else if(jsonPass.get("default") instanceof JsonObject){ + JsonObject object = jsonPass.getJsonObject("default"); + Set keys = object.keySet(); + for(int i = 0; i < ((ArrayList) dataArray.get(1)).size(); i++){ + cycicResize((ArrayList) ((ArrayList) dataArray.get(1)).get(i)); + } + ((ArrayList) ((ArrayList) dataArray.get(1)).get(0)).set(5, keys.toArray()[0].toString()); + ((ArrayList) ((ArrayList) dataArray.get(1)).get(1)).set(5, object.get(keys.toArray()[0]).toString()); + } else if(jsonPass.get("default") != null) { + + } return dataArray; From ba4b419aa6dc00e69655263f093d53a4bfbf298f Mon Sep 17 00:00:00 2001 From: flanflanagan Date: Thu, 30 Oct 2014 00:44:28 -0500 Subject: [PATCH 002/246] dialogs work again! Time to fix everything! --- cyclist/.classpath | 2 +- cyclist/src/edu/utexas/cycic/CycicCircles.java | 13 ++++++++++++- cyclist/src/edu/utexas/cycic/TimelineDisplay.java | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/cyclist/.classpath b/cyclist/.classpath index ae6dc9ff..5a27cc1c 100644 --- a/cyclist/.classpath +++ b/cyclist/.classpath @@ -14,6 +14,6 @@ - + diff --git a/cyclist/src/edu/utexas/cycic/CycicCircles.java b/cyclist/src/edu/utexas/cycic/CycicCircles.java index cac93ab0..68d0f7db 100644 --- a/cyclist/src/edu/utexas/cycic/CycicCircles.java +++ b/cyclist/src/edu/utexas/cycic/CycicCircles.java @@ -2,6 +2,8 @@ import java.io.File; +import org.controlsfx.dialog.Dialogs; + import edu.utah.sci.cyclist.core.controller.CyclistController; import edu.utah.sci.cyclist.core.event.dnd.DnD; import edu.utah.sci.cyclist.core.event.notification.EventBus; @@ -33,6 +35,7 @@ import javafx.scene.text.Font; import javafx.scene.text.Text; import javafx.scene.text.TextAlignment; +import javafx.stage.Window; /** * The class used to build a new Prototype Facility node. @@ -45,6 +48,7 @@ public class CycicCircles{ protected static double mousex; protected static double x; protected static double y; + static Window window; /** * Function to build a prototype facility node. This node will contain @@ -125,7 +129,14 @@ public void handle(ActionEvent e){ }); final Menu changeNiche = new Menu("Change Niche"); - + changeNiche.setOnAction(new EventHandler(){ + public void handle(ActionEvent e){ + Dialogs.create() + .owner(window) + .message("MESSAGE") + .showInformation(); + } + }); circle.image.setLayoutX(circle.getCenterX()-60); circle.image.setLayoutY(circle.getCenterY()-60); diff --git a/cyclist/src/edu/utexas/cycic/TimelineDisplay.java b/cyclist/src/edu/utexas/cycic/TimelineDisplay.java index 73df0600..dd7f6e65 100644 --- a/cyclist/src/edu/utexas/cycic/TimelineDisplay.java +++ b/cyclist/src/edu/utexas/cycic/TimelineDisplay.java @@ -160,9 +160,9 @@ private void init (){ // } // }); // for controlsfx 8.0.6 - checkBox.getCheckModel().getSelectedItems().addListener(new ListChangeListener() { + checkBox.getCheckModel().getCheckedItems().addListener(new ListChangeListener() { public void onChanged(ListChangeListener.Change c) { - System.out.println(checkBox.getCheckModel().getSelectedItems()); + System.out.println(checkBox.getCheckModel().getCheckedItems()); setPane(); } From f185bed00fe0ebec5a705efe33690280d2fdf83b Mon Sep 17 00:00:00 2001 From: flanflanagan Date: Thu, 30 Oct 2014 00:44:53 -0500 Subject: [PATCH 003/246] added controlsfx 8.20.8 --- cnome/bin/.cnome/generalConfig.xml | 7 + cnome/bin/.project | 23 + .../org.eclipse.ltk.core.refactoring.prefs | 2 + cnome/bin/cyclus.sqlite | Bin 0 -> 25600 bytes cnome/bin/disaster | 1 + cnome/bin/doc/allclasses-frame.html | 19 + cnome/bin/doc/allclasses-noframe.html | 19 + cnome/bin/doc/constant-values.html | 122 ++++ cnome/bin/doc/deprecated-list.html | 122 ++++ .../utexas/cycic/FormBuilderFunctions.html | 307 ++++++++++ .../cycic/class-use/FormBuilderFunctions.html | 122 ++++ .../doc/edu/utexas/cycic/package-frame.html | 20 + .../doc/edu/utexas/cycic/package-summary.html | 142 +++++ .../doc/edu/utexas/cycic/package-tree.html | 131 ++++ .../bin/doc/edu/utexas/cycic/package-use.html | 122 ++++ cnome/bin/doc/help-doc.html | 223 +++++++ cnome/bin/doc/index-files/index-1.html | 129 ++++ cnome/bin/doc/index-files/index-2.html | 127 ++++ cnome/bin/doc/index-files/index-3.html | 135 ++++ cnome/bin/doc/index.html | 71 +++ cnome/bin/doc/overview-tree.html | 135 ++++ cnome/bin/doc/package-list | 1 + cnome/bin/doc/script.js | 30 + cnome/bin/doc/stylesheet.css | 574 ++++++++++++++++++ cnome/bin/file.xml | 1 + cnome/bin/lib/javax.json-1.0.4.jar | Bin 0 -> 85147 bytes cnome/bin/savefile.xml | 1 + .../src/edu/utexas/cycic/ConnectorLine.class | Bin 0 -> 4518 bytes .../utexas/cycic/CycicAgentTreeTable.class | Bin 0 -> 1033 bytes .../edu/utexas/cycic/CycicNotifications.class | Bin 0 -> 788 bytes .../cycic/FormBuilderFunctions.java.orig | 458 ++++++++++++++ .../edu/utexas/cycic/RegionCorralView.class | Bin 0 -> 4840 bytes .../edu/utexas/cycic/RegionRectangle.class | Bin 0 -> 1877 bytes .../src/edu/utexas/cycic/RegionShape.class | Bin 0 -> 7746 bytes .../edu/utexas/cycic/TimelineDisplay.class | Bin 0 -> 7470 bytes .../bin/src/edu/utexas/cycic/XMLReader.class | Bin 0 -> 10043 bytes .../src/edu/utexas/cycic/XMLReader.java.orig | 245 ++++++++ .../CycicAgentTreeTablePresenter.class | Bin 0 -> 834 bytes .../presenter/RegionCorralViewPresenter.class | Bin 0 -> 1770 bytes .../presenter/TimelineDisplayPresenter.class | Bin 0 -> 822 bytes .../cycic/tools/CycicAgentTreeTableTool.class | Bin 0 -> 4127 bytes .../CycicAgentTreeTableToolFactory.class | Bin 0 -> 2461 bytes .../cycic/tools/RegionCorralViewTool.class | Bin 0 -> 4180 bytes .../tools/RegionCorralViewToolFactory.class | Bin 0 -> 2452 bytes .../cycic/tools/TimelineDisplayTool.class | Bin 0 -> 4110 bytes cnome/bin/test.xml | 1 + cyclist/lib/controlsfx-8.20.8.jar | Bin 0 -> 957666 bytes 47 files changed, 3290 insertions(+) create mode 100644 cnome/bin/.cnome/generalConfig.xml create mode 100644 cnome/bin/.project create mode 100644 cnome/bin/.settings/org.eclipse.ltk.core.refactoring.prefs create mode 100644 cnome/bin/cyclus.sqlite create mode 100644 cnome/bin/disaster create mode 100644 cnome/bin/doc/allclasses-frame.html create mode 100644 cnome/bin/doc/allclasses-noframe.html create mode 100644 cnome/bin/doc/constant-values.html create mode 100644 cnome/bin/doc/deprecated-list.html create mode 100644 cnome/bin/doc/edu/utexas/cycic/FormBuilderFunctions.html create mode 100644 cnome/bin/doc/edu/utexas/cycic/class-use/FormBuilderFunctions.html create mode 100644 cnome/bin/doc/edu/utexas/cycic/package-frame.html create mode 100644 cnome/bin/doc/edu/utexas/cycic/package-summary.html create mode 100644 cnome/bin/doc/edu/utexas/cycic/package-tree.html create mode 100644 cnome/bin/doc/edu/utexas/cycic/package-use.html create mode 100644 cnome/bin/doc/help-doc.html create mode 100644 cnome/bin/doc/index-files/index-1.html create mode 100644 cnome/bin/doc/index-files/index-2.html create mode 100644 cnome/bin/doc/index-files/index-3.html create mode 100644 cnome/bin/doc/index.html create mode 100644 cnome/bin/doc/overview-tree.html create mode 100644 cnome/bin/doc/package-list create mode 100644 cnome/bin/doc/script.js create mode 100644 cnome/bin/doc/stylesheet.css create mode 100644 cnome/bin/file.xml create mode 100644 cnome/bin/lib/javax.json-1.0.4.jar create mode 100644 cnome/bin/savefile.xml create mode 100644 cnome/bin/src/edu/utexas/cycic/ConnectorLine.class create mode 100644 cnome/bin/src/edu/utexas/cycic/CycicAgentTreeTable.class create mode 100644 cnome/bin/src/edu/utexas/cycic/CycicNotifications.class create mode 100644 cnome/bin/src/edu/utexas/cycic/FormBuilderFunctions.java.orig create mode 100644 cnome/bin/src/edu/utexas/cycic/RegionCorralView.class create mode 100644 cnome/bin/src/edu/utexas/cycic/RegionRectangle.class create mode 100644 cnome/bin/src/edu/utexas/cycic/RegionShape.class create mode 100644 cnome/bin/src/edu/utexas/cycic/TimelineDisplay.class create mode 100644 cnome/bin/src/edu/utexas/cycic/XMLReader.class create mode 100644 cnome/bin/src/edu/utexas/cycic/XMLReader.java.orig create mode 100644 cnome/bin/src/edu/utexas/cycic/presenter/CycicAgentTreeTablePresenter.class create mode 100644 cnome/bin/src/edu/utexas/cycic/presenter/RegionCorralViewPresenter.class create mode 100644 cnome/bin/src/edu/utexas/cycic/presenter/TimelineDisplayPresenter.class create mode 100644 cnome/bin/src/edu/utexas/cycic/tools/CycicAgentTreeTableTool.class create mode 100644 cnome/bin/src/edu/utexas/cycic/tools/CycicAgentTreeTableToolFactory.class create mode 100644 cnome/bin/src/edu/utexas/cycic/tools/RegionCorralViewTool.class create mode 100644 cnome/bin/src/edu/utexas/cycic/tools/RegionCorralViewToolFactory.class create mode 100644 cnome/bin/src/edu/utexas/cycic/tools/TimelineDisplayTool.class create mode 100644 cnome/bin/test.xml create mode 100644 cyclist/lib/controlsfx-8.20.8.jar diff --git a/cnome/bin/.cnome/generalConfig.xml b/cnome/bin/.cnome/generalConfig.xml new file mode 100644 index 00000000..7b7ff938 --- /dev/null +++ b/cnome/bin/.cnome/generalConfig.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/cnome/bin/.project b/cnome/bin/.project new file mode 100644 index 00000000..7d1ce039 --- /dev/null +++ b/cnome/bin/.project @@ -0,0 +1,23 @@ + + + cnome + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.xtext.ui.shared.xtextBuilder + + + + + + org.eclipse.xtext.ui.shared.xtextNature + org.eclipse.jdt.core.javanature + + diff --git a/cnome/bin/.settings/org.eclipse.ltk.core.refactoring.prefs b/cnome/bin/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 00000000..b196c64a --- /dev/null +++ b/cnome/bin/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/cnome/bin/cyclus.sqlite b/cnome/bin/cyclus.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..00294ce11324f07396f13360af9c9e9cfcfe5979 GIT binary patch literal 25600 zcmeGj-)|g8`F`1MlC}vn!StyYOBIc9v%Wh!wx!J$+p&XFJ8A4o0!WoJzTG=7x!XPM z?m0PxRQf=lh{Q`N0tp_lZ{xqG=Q*?(o<&R)#?6FLw6Tsb;EdHQtrmWOtm z#=6z+cxz_UaD&#dm95pK>T0pNw7jue4El>NY@4lhy|}z_WqG=I0eOft&s;q+KKa~p zS(gCZMD1$Us?*m|lQhnJg8>3NPr(*0*!nEq%a3CBu4ek>;xA5*N+is zYo^iEtKGKY2CZBOUeNzS6;pB{i0jd8Zc&L&j$$^v{koupJQF5B(zzA|c>i-BHsw7ErASDN+ z{-b z;O98L!~2wW(XnrPds{}sv@KP!;L@O`DsJ1TX)66~n!8%9TSG0|F;oRVsbtnBvQWct z)-Bh2Nb3~j)b~#k>II98_(2s8}KaFA!{J8k>6;b{7i8+%W=6fty`KZvKTWx%-i@eaLG7WbV7{jH68T- z>Ci-wID%LbO%AaTzA~;>SBmpzOXp^z;wD-XL5GP#0CRPtg)Du?S8-oV!kzw88#$;I zh*G4NEiqeyxP?2FFe;oR6YQ1gbv!V4nu_+3*~FKn+m7wo7%dGOfrRd)srXz|P7TyE zX@O~(o{5@FrJJVffgoC*1I90mS@5J{YL^d|u}_1+phpEwGdr#}J4XimClz8ivv#H9 zt&qSf!S6>Vs65!9=p`T<*cE!Z0fLn|idE1PLb*Hu%Ij8tjQKdFkUz!)H9{aCk1{0e zeFtYo;N=6N=jO2QeJCf#@lL>#k44W+S&51qcz7;Wx>j9#abXH_ zG6(}v)3%KBQABPl}9)nH;`Ni~kY2U;M; z27@ew!+w(Jf95Y4{2k@b8>e!G>F+)LR_)vKA9t7U{pRFE`TZ^Z`-dW_Wyo*`6jWG2 zMEC*3G%huLYbmZ?=duEE6|1udP2$gy?k3J-k$@lKc?J)dSh!5n$Y_2`wk4rF{-Mxm zWG~Kq*jaAs3^(R08J$9SCeRvq`ATJ>x0f%KXc(3*KI5L8@QMT>yekslQ2s@xL}Ir7 z{vUMy^YqL$FoPB(J-zEW+UnfSIWV^LydG&~N5go8YCXf0dPp@0I|aY=b10P`(VT~M z^uDBHZYy~GRwLr-)l(F%@6rIJ|;TIP%wbu<)cy27e5w5l6PH;EmHPiDm*ww9N9 z0CF8Fzf=grqr=vFTvFmqU&y(WdMZ8q;p;sPY{kn8U~6fWrvwLfV7({ZO6>C!>P!^x zR6F;n_h1=7F~`uij-s)%py$gmfFgm|#-o@w2hXCE#ODoMpb-ihR)=ZK0o8#{xdH(w zFJ(YJ3{mXNOhP>(sA=fhV!2$wrEp>0;(U*FypEB^b1~jVGxga%zH5PIujyP@P+F*W z45(od&lGe4Eov?pUBLXpZkQZDvP1E{ny6g zi(l+F#OFhM5zLJ!!zNOXpl`E5-#>?Sp1!I5zsSErk*SbqF*^E1rjN(FMJ6ptF=0ZV zOVav;0eEv9dzF>T^XfN+pO&82BN;fe7eWnzGM4fr*y~(nv3H z9~CaGe=s|?x%8`he;$8r>AnB19afwHLBoLMM@TLXJJ5hI`q5RohYc0L1MzDB`0X>R zk}{1>6#)bVH85;~`-i6iDnNr=1QV?bv$)&jR*&f9_d(oGVv(2rpH--O7M-w5dL*?b zdX&=t3zviNOFVKjGknhnB5QnqRa2$^_b+30002015cycamoreSourceBrightliteReactorFacilitycycamoreSinkcycamoreGrowthRegioncycamoreGrowthRegioncycamoreManagerInstcycamoreManagerInstRobert's stipendUsed stipendFeRobert's stipendStipend1.000000000000000E+299reactorsRobert's stipendUsed stipend30.9801.000000000000000E+2991000.00.330BeUsed stipend1.000000000000000E+2991.000000000000000E+299ETC 7.164FeBereactorsFe2reactors2Be2grad schoolBeWorld of warcraftJailStipendMass791971.0000002Pb10000000.0000002baked goodsMassC1.0000002Fe143.00200.0045.00Robert's stipendreactors350.00202.0045.00Robert's stipendRobert's stipendUsed stipendBe551.00200.0045.00Used stipend \ No newline at end of file diff --git a/cnome/bin/doc/allclasses-frame.html b/cnome/bin/doc/allclasses-frame.html new file mode 100644 index 00000000..c46d8fdf --- /dev/null +++ b/cnome/bin/doc/allclasses-frame.html @@ -0,0 +1,19 @@ + + + + + +All Classes + + + + + +

All Classes

+ + + diff --git a/cnome/bin/doc/allclasses-noframe.html b/cnome/bin/doc/allclasses-noframe.html new file mode 100644 index 00000000..b51bb4d2 --- /dev/null +++ b/cnome/bin/doc/allclasses-noframe.html @@ -0,0 +1,19 @@ + + + + + +All Classes + + + + + +

All Classes

+ + + diff --git a/cnome/bin/doc/constant-values.html b/cnome/bin/doc/constant-values.html new file mode 100644 index 00000000..b0f94e34 --- /dev/null +++ b/cnome/bin/doc/constant-values.html @@ -0,0 +1,122 @@ + + + + + +Constant Field Values + + + + + + + + + + + +
+

Constant Field Values

+

Contents

+
+ + + + + + diff --git a/cnome/bin/doc/deprecated-list.html b/cnome/bin/doc/deprecated-list.html new file mode 100644 index 00000000..be4040a1 --- /dev/null +++ b/cnome/bin/doc/deprecated-list.html @@ -0,0 +1,122 @@ + + + + + +Deprecated List + + + + + + + + +
+ + + + + + + +
+ + +
+

Deprecated API

+

Contents

+
+ +
+ + + + + + + +
+ + + + diff --git a/cnome/bin/doc/edu/utexas/cycic/FormBuilderFunctions.html b/cnome/bin/doc/edu/utexas/cycic/FormBuilderFunctions.html new file mode 100644 index 00000000..61614824 --- /dev/null +++ b/cnome/bin/doc/edu/utexas/cycic/FormBuilderFunctions.html @@ -0,0 +1,307 @@ + + + + + +FormBuilderFunctions + + + + + + + + + + + + +
+
edu.utexas.cycic
+

Class FormBuilderFunctions

+
+
+
    +
  • java.lang.Object
  • +
  • +
      +
    • edu.utexas.cycic.FormBuilderFunctions
    • +
    +
  • +
+
+
    +
  • +
    +
    +
    public class FormBuilderFunctions
    +extends java.lang.Object
    +
    This class is built to handle all of the functions used in building the forms for CYCIC.
    +
    +
    Author:
    +
    Robert
    +
    +
  • +
+
+
+
    +
  • + + + +
      +
    • + + +

      Method Summary

      + + + + + + + + + + + + + + +
      All Methods Static Methods Concrete Methods 
      Modifier and TypeMethod and Description
      static voidarrayListCopy(java.util.ArrayList<java.lang.Object> baseList, + java.util.ArrayList<java.lang.Object> copyList) +
      A function used to copy the internal structure of an ArrayList. +
      static voidformArrayBuilder(java.util.ArrayList<java.lang.Object> facArray, + java.util.ArrayList<java.lang.Object> dataArray) +
      This method is used to read and create the forms associated with each facility.
      +
      +
        +
      • + + +

        Methods inherited from class java.lang.Object

        +equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +
      +
    • +
    +
  • +
+
+
+