Context Navigation

surveyor

Timestamp:

2014-10-18T23:07:52+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix Java 7 / unused code warnings

Location:

applications/editors/josm/plugins/surveyor/src

Files:

r26509	r30737
73	73	*/
74	74	private static List<SurveyorActionDescription> createFromOneElement(SurveyorActionDescription actionDescription) {
75		List<SurveyorActionDescription> list = new ArrayList<~~SurveyorActionDescription~~>();
	75	List<SurveyorActionDescription> list = new ArrayList<>();
76	76	list.add(actionDescription);
77	77	return list;

r13497	r30737
51	51	super();
52	52	this.actionClass = actionClass;
53		this.params = new ArrayList<~~String~~>();
	53	this.params = new ArrayList<>();
54	54	for (int index = 0; index < params.length; index++) {
55	55	this.params.add(params[index]);

r13497	r30737
18	18	*/
19	19	public class SurveyorActionFactory {
20		private static Map<String, SurveyorAction>actionCache = new HashMap<~~String, SurveyorAction~~>();
	20	private static Map<String, SurveyorAction>actionCache = new HashMap<>();
21	21	public static final String DEFAULT_PACKAGE = SurveyorActionFactory.class.getPackage().getName() + ".action";
22	22

-              r30646
+              r30737
     public SurveyorComponent() {
         super();
         hotKeys = new HashSet<String>();
+        hotKeys = new HashSet<>();
         setLayout(new BorderLayout());
         streetLabel = new JLabel(tr("Way: "));
 …
             e.printStackTrace();
+        }
         List<SurveyorActionDescription> actions = new ArrayList<SurveyorActionDescription>();
+        List<SurveyorActionDescription> actions = new ArrayList<>();
         while(parser.hasNext()) {
             Object object = parser.next();

-              r30646
+              r30737
         SurveyorComponent surveyorComponent = null;
         parser.start(new BufferedReader(new InputStreamReader(in)));
         List<SurveyorActionDescription> actions = new ArrayList<SurveyorActionDescription>();
+        List<SurveyorActionDescription> actions = new ArrayList<>();
         while(parser.hasNext()) {
             Object object = parser.next();
 …
                 ((ButtonDescription)object).setActions(actions);
                 surveyorComponent.addButton(((ButtonDescription)object));
                 actions = new ArrayList<SurveyorActionDescription>();
+                actions = new ArrayList<>();
             } else if (object instanceof SurveyorActionDescription) {
                 //System.out.println("SurveyorActionDescription " + object);

-              r30646
+              r30737
     @Override
     public void setParameters(List<String> parameters) {
         keyValues = new ArrayList<Pair<String, String>>();
+        keyValues = new ArrayList<>();
         int pos;
         String key;
 …
                 key = keyValuePair.substring(0, pos);
                 value = keyValuePair.substring(pos + 1);
                 keyValues.add(new Pair<String, String>(key, value));
+                keyValues.add(new Pair<>(key, value));
             } else {
                 System.err.println("SetNodeAction: ignoring invalid key value pair: " + keyValuePair);

-              r30646
+              r30737
+  {
     int token = nextToken();
     List<String> list = new ArrayList<String>();
+    List<String> list = new ArrayList<>();
     String word = "";
 //    while(token != Tokenizer.EOF)
 …
       Iterator<String> iterator = list.iterator();
       String value;
       List<String> new_list = new ArrayList<String>();
+      List<String> new_list = new ArrayList<>();
       while(iterator.hasNext())
+      {

Note: See TracChangeset for help on using the changeset viewer.