- New Feature: AutoConnect

  connections can be set to auto-connect and will then connect on startup (if possible)
- Version number is read from Maven POM and used in Window title
- Copyright adjusted to 2014
- removed unused imports

pom.xml

@@ -10,7 +10,7 @@
 	<!-- general project information -->
 	<groupId>de.hshannover.f4.trust</groupId>
 	<artifactId>irongui</artifactId>
-	<version>0.4.2</version>
+	<version>0.4.3</version>
 	<packaging>jar</packaging>
 	<name>irongui</name>
 	<url>http://trust.f4.hs-hannover.de</url>
@@ -107,16 +107,23 @@
 					<licenseName>apache_v2</licenseName>
 					<canUpdateDescription>true</canUpdateDescription>
 					<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
+					<canUpdateCopyright>false</canUpdateCopyright>
 					<descriptionTemplate>${basedir}/src/license/description_template.ftl</descriptionTemplate>
 					<roots>
 						<root>src/main/java</root>
 						<root>src/test/java</root>
 					</roots>
 				</configuration>
-
 			</plugin>
-
 		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+				<filtering>true</filtering>
+				<targetPath>../filtered-source/java</targetPath>
+			</resource>
+		</resources>
+		<sourceDirectory>target/filtered-source/java</sourceDirectory>
 	</build>
 
 	<repositories>

src/main/java/de/hshannover/f4/trust/irongui/Client.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,6 +56,8 @@
 
 public class Client {
 
+	public static final String VERSION = "${project.version}";
+
 	private final ViewController mViewController;
 	private final IfmapFacade mIfmapFacade;
 

src/main/java/de/hshannover/f4/trust/irongui/communication/Connection.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,15 +57,15 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.Semaphore;
 
+import de.hshannover.f4.trust.ifmapj.exception.IfmapErrorResult;
+import de.hshannover.f4.trust.ifmapj.exception.IfmapException;
+import de.hshannover.f4.trust.ifmapj.identifier.Identifier;
+import de.hshannover.f4.trust.ifmapj.messages.PollResult;
 import de.hshannover.f4.trust.irongui.control.IfmapFacade;
 import de.hshannover.f4.trust.irongui.datastructure.IdentifierData;
 import de.hshannover.f4.trust.irongui.datastructure.PollResultContainer;
 import de.hshannover.f4.trust.irongui.datastructure.SubscriptionRepository;
 import de.hshannover.f4.trust.irongui.util.CryptoUtil;
-import de.hshannover.f4.trust.ifmapj.exception.IfmapErrorResult;
-import de.hshannover.f4.trust.ifmapj.exception.IfmapException;
-import de.hshannover.f4.trust.ifmapj.identifier.Identifier;
-import de.hshannover.f4.trust.ifmapj.messages.PollResult;
 
 public class Connection {
 
@@ -232,7 +232,8 @@ private ConnectionParameter cloneConnectionParameter(ConnectionParameter tmp) {
 		params.setBasicAuthEnabled(tmp.isBasicAuthEnabled());
 		params.setBasicauthUser(tmp.getBasicauthUser());
 		params.setBasicauthPass(tmp.getBasicauthPass());
-		params.setAutoSubscribe(tmp.isAutoSubscribe());
+		params.setDump(tmp.isDump());
+		params.setAutoConnect(tmp.isAutoConnect());
 		params.setMaxPollSize(tmp.getMaxPollSize());
 		return params;
 	}

src/main/java/de/hshannover/f4/trust/irongui/communication/ConnectionFactory.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,7 +58,7 @@ public static Connection createConnection(ConnectionParameter params)
 				params.getKeystorePass(), params.getTruststore(),
 				params.getTruststorePass(), params.isBasicAuthEnabled(),
 				params.getBasicauthUser(), params.getBasicauthPass(),
-				params.isAutoSubscribe(), params.getMaxPollSize());
+				params.isDump(), params.isAutoConnect(), params.getMaxPollSize());
 		return new Connection(tmp);
 	}
 
@@ -72,7 +72,7 @@ public static ConnectionParameter createConnectionParameter(String name)
 	public static ConnectionParameter createConnectionParameter(String name,
 			String url, String keyPath, String keyPass, String trustPath,
 			String trustPass, boolean enableBasicAuth, String basicUser,
-			String basicPass, boolean autoSubscribe, int maxPoll)
+			String basicPass, boolean dump, boolean autoConnect, int maxPoll)
 			throws ConnectionCreationException {
 		/**
 		 * @TODO do checks here (null, path, passwords)
@@ -87,7 +87,8 @@ public static ConnectionParameter createConnectionParameter(String name,
 		params.setBasicAuthEnabled(enableBasicAuth);
 		params.setBasicauthUser(basicUser);
 		params.setBasicauthPass(basicPass);
-		params.setAutoSubscribe(autoSubscribe);
+		params.setDump(dump);
+		params.setAutoConnect(autoConnect);
 		params.setMaxPollSize(maxPoll);
 		return params;
 	}

src/main/java/de/hshannover/f4/trust/irongui/communication/ConnectionParameter.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -130,12 +130,20 @@ public void setDumpFilter(String dumpFilter) {
 		this.dumpFilter = dumpFilter;
 	}
 
-	public boolean isAutoSubscribe() {
-		return autoSubscribe;
+	public boolean isDump() {
+		return dump;
+	}
+
+	public boolean isAutoConnect() {
+		return autoConnect;
 	}
 
-	public void setAutoSubscribe(boolean autoSubscribe) {
-		this.autoSubscribe = autoSubscribe;
+	public void setDump(boolean dump) {
+		this.dump = dump;
+	}
+
+	public void setAutoConnect(boolean autoConnect) {
+		this.autoConnect = autoConnect;
 	}
 
 	public int getMaxPollSize() {
@@ -154,7 +162,8 @@ public ConnectionParameter clone() {
 		param.setKeystorePass(getKeystorePass());
 		param.setTruststore(getTruststore());
 		param.setTruststorePass(getTruststorePass());
-		param.setAutoSubscribe(isAutoSubscribe());
+		param.setDump(isDump());
+		param.setAutoConnect(isAutoConnect());
 		param.setBasicAuthEnabled(isBasicAuthEnabled());
 		param.setBasicauthUser(getBasicauthUser());
 		param.setBasicauthPass(getBasicauthPass());
@@ -178,7 +187,8 @@ public String toString() {
 	private String basicauthUser;
 	private String basicauthPass;
 	private String dumpFilter;
-	private boolean autoSubscribe;
+	private boolean dump;
+	private boolean autoConnect;
 	private int maxPollSize;	
 
 }

src/main/java/de/hshannover/f4/trust/irongui/communication/ConnectionRepository.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/de/hshannover/f4/trust/irongui/communication/DumpImpl.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/de/hshannover/f4/trust/irongui/communication/DumpRequest.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/de/hshannover/f4/trust/irongui/communication/DumpResult.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/de/hshannover/f4/trust/irongui/communication/IfmapCommunication.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/de/hshannover/f4/trust/irongui/communication/IfmapMarshaller.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,6 +55,10 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import de.hshannover.f4.trust.ifmapj.identifier.Identifier;
+import de.hshannover.f4.trust.ifmapj.messages.PollResult;
+import de.hshannover.f4.trust.ifmapj.messages.ResultItem;
+import de.hshannover.f4.trust.ifmapj.messages.SearchResult;
 import de.hshannover.f4.trust.irongui.datastructure.IdentifierData;
 import de.hshannover.f4.trust.irongui.datastructure.IfmapDataType;
 import de.hshannover.f4.trust.irongui.datastructure.Link;
@@ -64,10 +68,6 @@
 import de.hshannover.f4.trust.irongui.datastructure.SubscriptionRepository;
 import de.hshannover.f4.trust.irongui.exception.LinkConstructionException;
 import de.hshannover.f4.trust.irongui.exception.NoValidIdentifierTypeException;
-import de.hshannover.f4.trust.ifmapj.identifier.Identifier;
-import de.hshannover.f4.trust.ifmapj.messages.PollResult;
-import de.hshannover.f4.trust.ifmapj.messages.ResultItem;
-import de.hshannover.f4.trust.ifmapj.messages.SearchResult;
 
 public class IfmapMarshaller {
 
@@ -147,7 +147,7 @@ public static PollResultContainer filterPollResult(Connection con,
 					} else {
 						id1 = (IdentifierData) delData;
 					}
-					if(con.getConnectionParameters().isAutoSubscribe()) {
+					if(con.getConnectionParameters().isDump()) {
 						if (data.equals(id1) || (id2 != null && data.equals(id2))) {
 							deleteResult.add(delData);
 						}

src/main/java/de/hshannover/f4/trust/irongui/control/IfmapFacade.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,6 +48,9 @@
 import java.io.IOException;
 import java.util.HashMap;
 
+import de.hshannover.f4.trust.ifmapj.exception.IfmapErrorResult;
+import de.hshannover.f4.trust.ifmapj.exception.IfmapException;
+import de.hshannover.f4.trust.ifmapj.identifier.Identifier;
 import de.hshannover.f4.trust.irongui.communication.Connection;
 import de.hshannover.f4.trust.irongui.datastructure.PollResultContainer;
 import de.hshannover.f4.trust.irongui.event.EventService;
@@ -56,10 +59,6 @@
 import de.hshannover.f4.trust.irongui.exception.ConnectionCreationException;
 import de.hshannover.f4.trust.irongui.exception.PropertiesNotFoundException;
 import de.hshannover.f4.trust.irongui.properties.SynchronisationService;
-import de.hshannover.f4.trust.irongui.view.component.GraphPanel;
-import de.hshannover.f4.trust.ifmapj.exception.IfmapErrorResult;
-import de.hshannover.f4.trust.ifmapj.exception.IfmapException;
-import de.hshannover.f4.trust.ifmapj.identifier.Identifier;
 
 public final class IfmapFacade {
 

src/main/java/de/hshannover/f4/trust/irongui/datastructure/IdentifierConstants.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/de/hshannover/f4/trust/irongui/datastructure/IdentifierData.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,13 +48,13 @@
 import java.util.Hashtable;
 import java.util.Map;
 
-import de.hshannover.f4.trust.irongui.datastructure.IdentifierConstants.IdentifierType;
 import de.hshannover.f4.trust.ifmapj.identifier.AccessRequest;
 import de.hshannover.f4.trust.ifmapj.identifier.Device;
 import de.hshannover.f4.trust.ifmapj.identifier.Identifier;
 import de.hshannover.f4.trust.ifmapj.identifier.Identity;
 import de.hshannover.f4.trust.ifmapj.identifier.IpAddress;
 import de.hshannover.f4.trust.ifmapj.identifier.MacAddress;
+import de.hshannover.f4.trust.irongui.datastructure.IdentifierConstants.IdentifierType;
 
 /**
  * Represents an IdentifierData

src/main/java/de/hshannover/f4/trust/irongui/datastructure/IfmapDataType.java

@@ -18,10 +18,10 @@
  * Email: [email protected]
  * Website: http://trust.f4.hs-hannover.de/
  * 
- * This file is part of irongui, version 0.4.2,
+ * This file is part of irongui, version 0.4.3,
  * implemented by the Trust@HsH research group at the Hochschule Hannover.
  * %%
- * Copyright (C) 2010 - 2013 Trust@HsH
+ * Copyright (C) 2010 - 2014 Trust@HsH
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.