Browse Source

switch zeugs wieder hin, weil merge es gelöscht hat

Kevin Trometer 8 years ago
parent
commit
74ab3fae44
1 changed files with 7 additions and 10 deletions
  1. 7 10
      src/ui/view/GUI.java

+ 7 - 10
src/ui/view/GUI.java

@@ -1,18 +1,15 @@
 package ui.view;
 
-import java.awt.AWTException;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Cursor;
-import java.awt.Dialog;
 import java.awt.Dimension;
 import java.awt.Image;
 import java.awt.Point;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.KeyListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
@@ -27,7 +24,6 @@ import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JComboBox;
-import javax.swing.JDialog;
 import javax.swing.JEditorPane;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
@@ -51,15 +47,11 @@ import javax.swing.border.LineBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.plaf.basic.BasicSplitPaneUI.KeyboardDownRightHandler;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 
-import com.sun.glass.events.KeyEvent;
-import com.sun.glass.ui.Robot;
-
 import Interfaces.CategoryListener;
 import classes.Category;
 import classes.CpsEdge;
@@ -68,7 +60,6 @@ import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
 import classes.HolonTransformer;
-import jdk.internal.util.xml.impl.Input;
 import ui.controller.Control;
 import ui.model.Model;
 import ui.view.PropertyTable;;
@@ -739,6 +730,12 @@ public class GUI<E> implements CategoryListener {
 						deleteRows();
 						Object[] tempRatioPerc = { "Ratio Type", true };
 						tableModelProperties.addRow(tempRatioPerc);
+					} else if (temp instanceof HolonSwitch) {
+						deleteRows();
+						Object[] tempActive= { "Active", ((HolonSwitch) temp).getState()};
+						tableModelProperties.addRow(tempActive);
+						unitGraph.repaintWithNewSwitch((HolonSwitch) temp);
+						elementGraph.setText(temp.getName());
 					} else {
 						deleteRows();
 					}
@@ -859,7 +856,7 @@ public class GUI<E> implements CategoryListener {
 				JFrame test = new JFrame();
 				FileNameExtensionFilter jsonFilter = new FileNameExtensionFilter("*.json", "json");
 				fileChooser.setFileFilter(jsonFilter);
-				
+
 				if (fileChooser.showOpenDialog(test) == JFileChooser.APPROVE_OPTION) {
 					File file = fileChooser.getSelectedFile();