dominik.rieder 7 лет назад
Родитель
Сommit
ab3a30f769
1 измененных файлов с 27 добавлено и 33 удалено
  1. 27 33
      src/ui/view/StatisticPane.java

+ 27 - 33
src/ui/view/StatisticPane.java

@@ -17,13 +17,13 @@ import javax.swing.SwingConstants;
 import javax.swing.JComboBox;
 
 public class StatisticPane extends JPanel{
-	private JScrollPane myScrollPane = new JScrollPane();
+	private JScrollPane listScrollPane = new JScrollPane();
     private JList objectList;
     private DefaultListModel model =  new DefaultListModel();
     
     public StatisticPane(){
     	objectList = new JList(model);
-    	myScrollPane.setViewportView(objectList);
+    	listScrollPane.setViewportView(objectList);
     	
     	JLabel lblOverallStatistics = new JLabel("Overall Statistics:");
     	lblOverallStatistics.setFont(new Font("Tahoma", Font.PLAIN, 13));
@@ -55,38 +55,32 @@ public class StatisticPane extends JPanel{
     	groupLayout.setHorizontalGroup(
     		groupLayout.createParallelGroup(Alignment.LEADING)
     			.addGroup(groupLayout.createSequentialGroup()
+    				.addContainerGap()
     				.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
-    					.addGroup(groupLayout.createSequentialGroup()
-    						.addContainerGap()
-    						.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
-    							.addComponent(lblOverallStatistics, GroupLayout.PREFERRED_SIZE, 126, GroupLayout.PREFERRED_SIZE)
-    							.addGroup(groupLayout.createSequentialGroup()
-    								.addGap(10)
-    								.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
-    									.addComponent(chckbxNewCheckBox_1)
-    									.addComponent(chckbxNewCheckBox)))))
-    					.addGroup(groupLayout.createSequentialGroup()
-    						.addContainerGap()
-    						.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
-    							.addComponent(lblObject, GroupLayout.PREFERRED_SIZE, 56, GroupLayout.PREFERRED_SIZE)
-    							.addGroup(groupLayout.createSequentialGroup()
-    								.addGap(10)
-    								.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
+    					.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
+    						.addGroup(groupLayout.createSequentialGroup()
+    							.addGap(10)
+    							.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
+    								.addComponent(chckbxNewCheckBox_1)
+    								.addComponent(chckbxNewCheckBox)))
+    						.addComponent(lblObject, GroupLayout.PREFERRED_SIZE, 56, GroupLayout.PREFERRED_SIZE)
+    						.addGroup(groupLayout.createSequentialGroup()
+    							.addGap(10)
+    							.addGroup(groupLayout.createParallelGroup(Alignment.LEADING)
+    								.addGroup(groupLayout.createSequentialGroup()
+    									.addGap(4)
+    									.addComponent(lblName)
+    									.addPreferredGap(ComponentPlacement.RELATED)
+    									.addComponent(lblNewLabel, GroupLayout.PREFERRED_SIZE, 107, GroupLayout.PREFERRED_SIZE))
+    								.addComponent(checkBox_1, GroupLayout.PREFERRED_SIZE, 101, GroupLayout.PREFERRED_SIZE)
+    								.addGroup(groupLayout.createParallelGroup(Alignment.LEADING, false)
     									.addGroup(groupLayout.createSequentialGroup()
-    										.addGap(4)
-    										.addComponent(lblName)
+    										.addComponent(lblGraph, GroupLayout.PREFERRED_SIZE, 54, GroupLayout.PREFERRED_SIZE)
     										.addPreferredGap(ComponentPlacement.RELATED)
-    										.addComponent(lblNewLabel, GroupLayout.PREFERRED_SIZE, 107, GroupLayout.PREFERRED_SIZE))
-    									.addComponent(checkBox_1, GroupLayout.PREFERRED_SIZE, 101, GroupLayout.PREFERRED_SIZE)
-    									.addGroup(groupLayout.createParallelGroup(Alignment.TRAILING, false)
-    										.addGroup(Alignment.LEADING, groupLayout.createSequentialGroup()
-    											.addComponent(lblGraph, GroupLayout.PREFERRED_SIZE, 54, GroupLayout.PREFERRED_SIZE)
-    											.addPreferredGap(ComponentPlacement.RELATED)
-    											.addComponent(comboBox, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-    										.addComponent(checkBox, Alignment.LEADING, GroupLayout.PREFERRED_SIZE, 111, GroupLayout.PREFERRED_SIZE))))))
-    					.addGroup(groupLayout.createSequentialGroup()
-    						.addContainerGap()
-    						.addComponent(myScrollPane, GroupLayout.PREFERRED_SIZE, 177, GroupLayout.PREFERRED_SIZE)))
+    										.addComponent(comboBox, 0, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+    									.addComponent(checkBox, GroupLayout.PREFERRED_SIZE, 111, GroupLayout.PREFERRED_SIZE)))))
+    					.addComponent(lblOverallStatistics, GroupLayout.PREFERRED_SIZE, 126, GroupLayout.PREFERRED_SIZE)
+    					.addComponent(listScrollPane, GroupLayout.PREFERRED_SIZE, 177, GroupLayout.PREFERRED_SIZE))
     				.addContainerGap(263, Short.MAX_VALUE))
     	);
     	groupLayout.setVerticalGroup(
@@ -113,8 +107,8 @@ public class StatisticPane extends JPanel{
     					.addComponent(lblGraph)
     					.addComponent(comboBox, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
     				.addGap(57)
-    				.addComponent(myScrollPane, GroupLayout.PREFERRED_SIZE, 177, GroupLayout.PREFERRED_SIZE)
-    				.addGap(1))
+    				.addComponent(listScrollPane, GroupLayout.PREFERRED_SIZE, 177, GroupLayout.PREFERRED_SIZE)
+    				.addContainerGap(23, Short.MAX_VALUE))
     	);
     	setLayout(groupLayout);