dominik.rieder 8 роки тому
батько
коміт
1d3aa883c3

BIN
bin/Interfaces/CategoryListener.class


BIN
bin/Interfaces/ComparableObject.class


BIN
bin/classes/Category.class


BIN
bin/classes/CpsObject.class


BIN
bin/classes/HolonElement.class


BIN
bin/classes/HolonObject.class


BIN
bin/classes/HolonSwitch.class


BIN
bin/classes/HolonTransformer.class


BIN
bin/classes/Position.class


BIN
bin/exceptions/newException1.class


BIN
bin/tests/Tests1.class


BIN
bin/tests/praktikumHolonsTestMinimal.class


BIN
bin/ui/controller/CategoryController.class


BIN
bin/ui/controller/Control$command.class


BIN
bin/ui/controller/Control.class


BIN
bin/ui/controller/ObjectControl.class


BIN
bin/ui/model/IdCounter.class


BIN
bin/ui/model/Model.class


BIN
bin/ui/model/tests.class


BIN
bin/ui/view/GUI$1.class


BIN
bin/ui/view/GUI$2.class


BIN
bin/ui/view/GUI$3.class


BIN
bin/ui/view/GUI$4.class


BIN
bin/ui/view/GUI$5.class


BIN
bin/ui/view/GUI$6.class


BIN
bin/ui/view/GUI.class


BIN
bin/ui/view/Main$1.class


BIN
bin/ui/view/Main.class


BIN
bin/ui/view/MyCanvas.class


BIN
bin/ui/view/RealPopUp.class


+ 3 - 3
src/ui/view/RealPopUp.java → src/ui/view/AddObjectPopUp.java

@@ -12,7 +12,7 @@ import javax.swing.JTextField;
 import javax.swing.JList;
 import javax.swing.SwingConstants;
 
-public class RealPopUp extends JDialog {
+public class AddObjectPopUp extends JDialog {
 
 	private final JPanel contentPanel = new JPanel();
 	private JTextField textField;
@@ -23,7 +23,7 @@ public class RealPopUp extends JDialog {
 	 */
 	public static void main(String[] args) {
 		try {
-			RealPopUp dialog = new RealPopUp();
+			AddObjectPopUp dialog = new AddObjectPopUp();
 			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
 			dialog.setVisible(true);
 		} catch (Exception e) {
@@ -34,7 +34,7 @@ public class RealPopUp extends JDialog {
 	/**
 	 * Create the dialog.
 	 */
-	public RealPopUp() {
+	public AddObjectPopUp() {
 		setBounds(100, 100, 450, 300);
 		getContentPane().setLayout(new BorderLayout());
 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

+ 3 - 3
src/ui/view/GUI.java

@@ -85,7 +85,7 @@ public class GUI implements CategoryListener {
 	private JTable table_2 = new JTable();
 	private final Model model;
 	private final Control controller;
-	private RealPopUp addObjectPopUP;
+	private AddObjectPopUp addObjectPopUP;
 
 	private final JPanel panel = new JPanel();
 	private final JComboBox comboBox = new JComboBox();
@@ -180,7 +180,7 @@ public class GUI implements CategoryListener {
 		splitPane_2.setDividerLocation(200);
 
 		splitPane.setLeftComponent(scrollPane_1);
-		Image img = new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage().getScaledInstance(30, 30, java.awt.Image.SCALE_SMOOTH);
+		final Image img = new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage().getScaledInstance(30, 30, java.awt.Image.SCALE_SMOOTH);
 		Icon icon = new ImageIcon(img);
 		DefaultTreeCellRenderer renderer = (DefaultTreeCellRenderer)tree.getCellRenderer();
         renderer.setLeafIcon(icon);
@@ -272,7 +272,7 @@ public class GUI implements CategoryListener {
 						break;
 							
 					default :
-						addObjectPopUP = new RealPopUp();
+						addObjectPopUP = new AddObjectPopUp();
 						addObjectPopUP.setVisible(true);
 						addObjectAction(selectedOption, selectedNode);
 						break;