summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2013-07-12 15:30:30 +0200
committerAndrew Branson <andrew.branson@cern.ch>2013-07-12 15:30:30 +0200
commit1b3656d44c059ed8db4d9c24b1be2ad526e9b866 (patch)
tree41f97efe8ee7350957c7767ceba9cf3ec408c77b
parent6c894131da18fa7aaa5bef23369c9b82b584035b (diff)
Cleanup of unused code and annotations
-rw-r--r--src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java1
-rw-r--r--src/main/java/com/c2kernel/process/AbstractMain.java2
-rw-r--r--src/main/java/com/c2kernel/process/ClientShell.java1
-rw-r--r--src/main/java/com/c2kernel/process/auth/ConsoleAuth.java1
4 files changed, 1 insertions, 4 deletions
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
index 1a9e2fa..11a4f1b 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
@@ -107,7 +107,6 @@ public class NewItem extends ModuleImport {
Viewpoint impView;
try {
impView = (Viewpoint)Gateway.getStorage().get(entPath.getSysKey(), ClusterStorage.VIEWPOINT+"/"+thisOutcome.schema+"/"+thisOutcome.viewname, null);
- String oldData = impView.getOutcome().getData();
Diff xmlDiff = new Diff(newOutcome.getDOM(), impView.getOutcome().getDOM());
if (xmlDiff.identical()) {
diff --git a/src/main/java/com/c2kernel/process/AbstractMain.java b/src/main/java/com/c2kernel/process/AbstractMain.java
index cc2a6c7..03807f0 100644
--- a/src/main/java/com/c2kernel/process/AbstractMain.java
+++ b/src/main/java/com/c2kernel/process/AbstractMain.java
@@ -94,7 +94,7 @@ abstract public class AbstractMain
// Dump params if log high enough
- if (Logger.doLog(3)) for (Enumeration e = argProps.propertyNames(); e.hasMoreElements();) {
+ if (Logger.doLog(3)) for (Enumeration<?> e = argProps.propertyNames(); e.hasMoreElements();) {
String next = (String)e.nextElement();
System.out.println("AbstractMain: Param "+next+": "+argProps.getProperty(next));
}
diff --git a/src/main/java/com/c2kernel/process/ClientShell.java b/src/main/java/com/c2kernel/process/ClientShell.java
index f0c3a0d..f109155 100644
--- a/src/main/java/com/c2kernel/process/ClientShell.java
+++ b/src/main/java/com/c2kernel/process/ClientShell.java
@@ -17,7 +17,6 @@ public class ClientShell extends StandardClient {
}
public void run() {
- @SuppressWarnings("resource") // closing the scanner closes system.in
Scanner scan = new Scanner(System.in);
System.out.print("> ");
while (scan.hasNextLine()) {
diff --git a/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java b/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java
index a3ea521..a6af253 100644
--- a/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java
+++ b/src/main/java/com/c2kernel/process/auth/ConsoleAuth.java
@@ -19,7 +19,6 @@ public class ConsoleAuth implements Authenticator {
public AgentProxy authenticate(String resource) throws Exception {
AgentProxy user = null;
if (resource!=null) System.out.println("Please log in"+(resource.length()>0?"to "+resource:""));
- @SuppressWarnings("resource") // closing the scanner closes system.in
Scanner scan = new Scanner(System.in);
int loginAttempts = 0;
while (user == null && loginAttempts++ < 3) {