From 0a03b6458f2edaaaa5329c12f370adf4643b2f13 Mon Sep 17 00:00:00 2001
From: Someone <someone@somenet.org>
Date: Mon, 17 Jun 2013 04:15:18 +0200
Subject: [PATCH] replaced all <> with explicit types - needed for jenkins

---
 .../java/at/ac/tuwien/sbc/valesriegler/common/Util.java     | 4 ++--
 .../at/ac/tuwien/sbc/valesriegler/group/GroupAgent.java     | 6 +++---
 .../sbc/valesriegler/group/gui/DeliveryOverviewModel.java   | 2 +-
 .../valesriegler/group/gui/GroupCreationDetailsPanel.java   | 2 +-
 .../sbc/valesriegler/group/gui/GroupCreationHandler.java    | 4 ++--
 .../sbc/valesriegler/group/gui/GroupOverviewModel.java      | 6 +++---
 .../pizzeria/gui/tablemodels/DeliveryOrdersModel.java       | 4 ++--
 .../pizzeria/gui/tablemodels/GroupsOverviewModel.java       | 2 +-
 .../pizzeria/gui/tablemodels/OrdersOverviewModel.java       | 6 +++---
 .../pizzeria/gui/tablemodels/TablesOverviewModel.java       | 4 ++--
 .../tuwien/sbc/valesriegler/xvsm/AbstractXVSMConnector.java | 2 +-
 .../at/ac/tuwien/sbc/valesriegler/xvsm/GroupAgentXVSM.java  | 2 +-
 .../ac/tuwien/sbc/valesriegler/xvsm/PizzeriaAgentXVSM.java  | 6 +++---
 13 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/common/Util.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/common/Util.java
index 0fb836e..ef34af0 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/common/Util.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/common/Util.java
@@ -93,7 +93,7 @@ public abstract class Util {
 			return Collections.emptyMap();
 		}
 
-		Map<Integer, T> myMap = new HashMap<>();
+		Map<Integer, T> myMap = new HashMap<Integer, T>();
 		for (T hasId : hasIds) {
 			myMap.put(hasId.getId(), hasId);
 		}
@@ -177,7 +177,7 @@ public abstract class Util {
 	}
 
 	public static Order createOrder(HasId group, GroupCreationDetailsRequest gc, boolean isDelivery) {
-		List<PizzaOrder> pizzaOrders = new ArrayList<>();
+		List<PizzaOrder> pizzaOrders = new ArrayList<PizzaOrder>();
 		for (PizzaType pt : gc.pizzaTypes) {
 			final PizzaOrder pizzaOrder = new PizzaOrder(pt);
             pizzaOrder.setDeliveryPizza(isDelivery);
diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/group/GroupAgent.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/group/GroupAgent.java
index 67f1778..47d3525 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/group/GroupAgent.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/group/GroupAgent.java
@@ -137,7 +137,7 @@ public class GroupAgent {
 	}
 
 	public List<DeliveryGroup> createGroups(List<PizzaType> pizzaTypes1, String pizzeria, int number) {
-		List<DeliveryGroup> newDeliveryGroups = new ArrayList<>();
+		List<DeliveryGroup> newDeliveryGroups = new ArrayList<DeliveryGroup>();
 		final String fakeAddress = "address";
 		final GroupCreationDetailsRequest gc = new GroupCreationDetailsRequest(number, 100, pizzaTypes1, fakeAddress,
 				pizzeria);
@@ -180,7 +180,7 @@ public class GroupAgent {
 
 	public void onGroupsCreated(List<Group> newGroups) {
 		if (!Util.useJMS) {
-			List<GroupData> groupData = new ArrayList<>();
+			List<GroupData> groupData = new ArrayList<GroupData>();
 
 			for (Group group : newGroups) {
 				groupData.add(group.getGroupData());
@@ -207,7 +207,7 @@ public class GroupAgent {
 
 	public void onDeliveryGroupsCreated(List<DeliveryGroup> newDeliveryGroups) {
 		if (!Util.useJMS) {
-			List<DeliveryGroupData> groupData = new ArrayList<>();
+			List<DeliveryGroupData> groupData = new ArrayList<DeliveryGroupData>();
 			for (DeliveryGroup group : newDeliveryGroups) {
 				groupData.add(group.getDeliveryGroupData());
 			}
diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/DeliveryOverviewModel.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/DeliveryOverviewModel.java
index 905f982..b2d9f18 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/DeliveryOverviewModel.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/DeliveryOverviewModel.java
@@ -39,7 +39,7 @@ public class DeliveryOverviewModel extends TableModel<DeliveryGroup> {
 
 	@Override
 	public Object getValueAt(int rowIndex, int columnIndex) {
-		List<DeliveryGroup> values = new ArrayList<>(items.values());
+		List<DeliveryGroup> values = new ArrayList<DeliveryGroup>(items.values());
 		DeliveryGroup group = values.get(rowIndex);
 		String wantedColumn = COLUMNS[columnIndex];
 		switch (wantedColumn) {
diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupCreationDetailsPanel.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupCreationDetailsPanel.java
index 374b822..5ca725f 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupCreationDetailsPanel.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupCreationDetailsPanel.java
@@ -96,7 +96,7 @@ public class GroupCreationDetailsPanel extends JPanel {
 			
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				List<PizzaType> types = new ArrayList<>();
+				List<PizzaType> types = new ArrayList<PizzaType>();
 				for(JComboBox combo : combos) {
 					types.add((PizzaType) combo.getSelectedItem());
 				}
diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupCreationHandler.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupCreationHandler.java
index 8aa5291..09cc921 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupCreationHandler.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupCreationHandler.java
@@ -44,8 +44,8 @@ class GroupCreationHandler {
     }
 
     public void createGroups(GroupCreationDetailsRequest gc) {
-        List<DeliveryGroup> newDeliveryGroups = new ArrayList<>();
-        List<Group> newNormalGroups = new ArrayList<>();
+        List<DeliveryGroup> newDeliveryGroups = new ArrayList<DeliveryGroup>();
+        List<Group> newNormalGroups = new ArrayList<Group>();
 
         for (int i = 0; i < gc.numberOfGroups; i++) {
             if(createDeliveryGroups) {
diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupOverviewModel.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupOverviewModel.java
index a321dff..e93f071 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupOverviewModel.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/group/gui/GroupOverviewModel.java
@@ -37,7 +37,7 @@ public class GroupOverviewModel extends TableModel<Group> {
 	}
 
 	public List<Group> getItems() {
-		return new ArrayList<>(items.values());
+		return new ArrayList<Group>(items.values());
 	}
 
 	public Group getGroupByID(int id) {
@@ -46,7 +46,7 @@ public class GroupOverviewModel extends TableModel<Group> {
 
 	@Override
 	public Object getValueAt(int rowIndex, int columnIndex) {
-		List<Group> values = new ArrayList<>(items.values());
+		List<Group> values = new ArrayList<Group>(items.values());
         // TODO make sure this is necessary...
 //        Collections.sort(values, new Comparator<Group>() {
 //            @Override
@@ -97,7 +97,7 @@ public class GroupOverviewModel extends TableModel<Group> {
 	 * @param newItems the group data of the corresponding groups
 	 */
 	public void addGroupData(List<GroupData> newItems) {
-		List<Group> groups = new ArrayList<>();
+		List<Group> groups = new ArrayList<Group>();
 		for (GroupData groupData : newItems) {
 			Group group = items.get(groupData.getId());
 			group.setGroupData(groupData);
diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/DeliveryOrdersModel.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/DeliveryOrdersModel.java
index 459d9fd..3f4e5db 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/DeliveryOrdersModel.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/DeliveryOrdersModel.java
@@ -31,7 +31,7 @@ public class DeliveryOrdersModel extends AbstractOrdersModel<DeliveryGroupData>
 
 	@Override
 	public Object getValueAt(int rowIndex, int columnIndex) {
-		List<DeliveryGroupData> values = new ArrayList<>(items.values());
+		List<DeliveryGroupData> values = new ArrayList<DeliveryGroupData>(items.values());
 		Collections.sort(values, Util.HAS_ORDER_COMPARATOR);
 		DeliveryGroupData group = values.get(rowIndex);
 		Order order = group.getOrder();
@@ -57,7 +57,7 @@ public class DeliveryOrdersModel extends AbstractOrdersModel<DeliveryGroupData>
 	}
 
 	public DeliveryGroupData getGroupOfRow(int rowIndex) {
-		List<DeliveryGroupData> values = new ArrayList<>(items.values());
+		List<DeliveryGroupData> values = new ArrayList<DeliveryGroupData>(items.values());
 		Collections.sort(values, Util.HAS_ORDER_COMPARATOR);
 		return values.get(rowIndex);
 	}
diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/GroupsOverviewModel.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/GroupsOverviewModel.java
index b754639..b88630b 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/GroupsOverviewModel.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/GroupsOverviewModel.java
@@ -24,7 +24,7 @@ public class GroupsOverviewModel extends TableModel<GroupData> {
 
 	@Override
 	public Object getValueAt(int rowIndex, int columnIndex) {
-		List<GroupData> values = new ArrayList<>(items.values());
+		List<GroupData> values = new ArrayList<GroupData>(items.values());
 		GroupData group = values.get(rowIndex);
 		String wantedColumn = COLUMNS[columnIndex];
 		switch (wantedColumn) {
diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/OrdersOverviewModel.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/OrdersOverviewModel.java
index 9b36714..3081772 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/OrdersOverviewModel.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/OrdersOverviewModel.java
@@ -22,7 +22,7 @@ public class OrdersOverviewModel extends AbstractOrdersModel<GroupData> {
 
     @Override
 	public Object getValueAt(int rowIndex, int columnIndex) {
-		List<GroupData> values = new ArrayList<>(items.values());
+		List<GroupData> values = new ArrayList<GroupData>(items.values());
         Collections.sort(values, Util.HAS_ORDER_COMPARATOR);
         GroupData group = values.get(rowIndex);
 		Order order = group.getOrder();
@@ -42,9 +42,9 @@ public class OrdersOverviewModel extends AbstractOrdersModel<GroupData> {
 	}
 
 	public GroupData getGroupOfRow(int rowIndex) {
-        final List<GroupData> values = new ArrayList<>(items.values());
+        final List<GroupData> values = new ArrayList<GroupData>(items.values());
         Collections.sort(values, Util.HAS_ORDER_COMPARATOR);
-        return new ArrayList<>(values).get(rowIndex);
+        return new ArrayList<GroupData>(values).get(rowIndex);
 	}
 
 	@Override
diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/TablesOverviewModel.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/TablesOverviewModel.java
index e8eb41a..035c72b 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/TablesOverviewModel.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/pizzeria/gui/tablemodels/TablesOverviewModel.java
@@ -21,7 +21,7 @@ public class TablesOverviewModel extends TableModel<Table> {
 
 	@Override
 	public Object getValueAt(int rowIndex, int columnIndex) {
-		List<Table> values = new ArrayList<>(items.values());
+		List<Table> values = new ArrayList<Table>(items.values());
 		Table table = values.get(rowIndex);
 		String wantedColumn = COLUMNS[columnIndex];
 		switch (wantedColumn) {
@@ -41,7 +41,7 @@ public class TablesOverviewModel extends TableModel<Table> {
 	}
 
 	public List<Integer> getIdsOfFreeTables() {
-		List<Integer> ids = new ArrayList<>();
+		List<Integer> ids = new ArrayList<Integer>();
 
 		synchronized (items) {
 			for (Table table : items.values()) {
diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/AbstractXVSMConnector.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/AbstractXVSMConnector.java
index fb1d4b7..031a555 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/AbstractXVSMConnector.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/AbstractXVSMConnector.java
@@ -95,7 +95,7 @@ public abstract class AbstractXVSMConnector {
             List<T> items, ContainerReference cref, long timeout, TransactionReference tx) {
 
         try {
-            List<Entry> entries = new ArrayList<>();
+            List<Entry> entries = new ArrayList<Entry>();
             for (Serializable item : items) {
                 entries.add(new Entry(item));
             }
diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/GroupAgentXVSM.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/GroupAgentXVSM.java
index 841eb1a..84a4a25 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/GroupAgentXVSM.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/GroupAgentXVSM.java
@@ -38,7 +38,7 @@ public class GroupAgentXVSM extends AbstractXVSMConnector {
 
                 synchronized (pizzeriaIdentifiers) {
                     final List<PizzeriaRegistration> pizzeriaRegistrations = castEntries(entries);
-                    final List<String> pizzeriaIds = new ArrayList<>();
+                    final List<String> pizzeriaIds = new ArrayList<String>();
                     for (PizzeriaRegistration registration : pizzeriaRegistrations) {
                         final String pizzeriaId = valueOf(registration.pizzeriaSpacePort);
                         if (!pizzeriaIdentifiers.contains(pizzeriaId)) {
diff --git a/src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/PizzeriaAgentXVSM.java b/src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/PizzeriaAgentXVSM.java
index 18d9977..f56b0b4 100644
--- a/src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/PizzeriaAgentXVSM.java
+++ b/src/main/java/at/ac/tuwien/sbc/valesriegler/xvsm/PizzeriaAgentXVSM.java
@@ -46,7 +46,7 @@ public class PizzeriaAgentXVSM extends AbstractXVSMConnector {
 
                 final List<Table> tables = castEntries(entries);
 
-                final ArrayList<Table> occupiedTables = new ArrayList<>();
+                final ArrayList<Table> occupiedTables = new ArrayList<Table>();
                 for (Table table : tables) {
                     if(! table.isFree()) occupiedTables.add(table);
                 }
@@ -105,7 +105,7 @@ public class PizzeriaAgentXVSM extends AbstractXVSMConnector {
 	}
 
     private List<GroupData> getOrderedGroups(List<GroupData> groups) {
-        final ArrayList<GroupData> orderedGroups = new ArrayList<>();
+        final ArrayList<GroupData> orderedGroups = new ArrayList<GroupData>();
         for (GroupData group : groups) {
             if(group.getState() != GroupState.WAITING) {
                 orderedGroups.add(group);
@@ -123,7 +123,7 @@ public class PizzeriaAgentXVSM extends AbstractXVSMConnector {
     }
 
     private List<GroupData> getWaitingGroups(List<GroupData> groups) {
-        final ArrayList<GroupData> waitingGroups = new ArrayList<>();
+        final ArrayList<GroupData> waitingGroups = new ArrayList<GroupData>();
         for (GroupData group : groups) {
             if (group.getState() == GroupState.WAITING) {
                 waitingGroups.add(group);
-- 
2.43.0