소스 검색

small fixes

dominik.rieder 7 년 전
부모
커밋
ebb79685aa
2개의 변경된 파일1개의 추가작업 그리고 8개의 파일을 삭제
  1. 1 0
      src/ui/controller/SimulationManager.java
  2. 0 8
      src/ui/view/AddElementPopUp.java

+ 1 - 0
src/ui/controller/SimulationManager.java

@@ -39,6 +39,7 @@ public class SimulationManager {
 				for(int i = 0; i < hl.getConnections().size(); i++){
 					CpsEdge edge = hl.getConnectedTo().get(i);
 					if(edge.getState()){
+						System.out.println(production + consumption);
 						if((production + consumption) >= 0 ){
 							hl.setSupplied(true);
 						}else{

+ 0 - 8
src/ui/view/AddElementPopUp.java

@@ -101,11 +101,6 @@ public class AddElementPopUp extends JDialog {
 		contentPanel.add(elementName);
 		elementName.setColumns(10);
 
-		final JComboBox sign = new JComboBox();
-		sign.setModel(new DefaultComboBoxModel(new String[] { "+", "-" }));
-		sign.setBounds(240, 46, 60, 20);
-		contentPanel.add(sign);
-
 		providedEnergy = new JTextField();
 		providedEnergy.setBounds(130, 46, 110, 20);
 		contentPanel.add(providedEnergy);
@@ -136,9 +131,6 @@ public class AddElementPopUp extends JDialog {
 							try {
 								float energy = Float.parseFloat(providedEnergy.getText().toString());
 								int elementAmount = Integer.parseInt(amount.getText().toString());
-								if (sign.getSelectedItem().toString().equals("-")) {
-									energy = energy * -1;
-								}
 								hl = new HolonElement(elementName.getText().toString(), elementAmount, energy);
 								dispose();
 							} catch (NumberFormatException e) {