summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2012-08-22 10:47:46 +0200
committerAndrew Branson <andrew.branson@cern.ch>2012-08-22 10:47:46 +0200
commite878db4ec1033eb93d9236241183a1133b4b3dc8 (patch)
tree77cb106ac72eaa8402a6de3afd1bae2307dc963f
parent63f2df4babca2cd2232d6b1f438ddcea1d3f3fa2 (diff)
Rename clashing parameter names
-rw-r--r--src/main/java/com/c2kernel/entity/proxy/AgentProxy.java8
-rw-r--r--src/main/java/com/c2kernel/utils/ActDefCache.java4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java b/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java
index 286be88..c5cff66 100644
--- a/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java
+++ b/src/main/java/com/c2kernel/entity/proxy/AgentProxy.java
@@ -286,12 +286,12 @@ public class AgentProxy extends EntityProxy
return (ItemProxy)Gateway.getProxyManager().getProxy(returnPath);
}
- public ItemProxy getItem(String path) throws ObjectNotFoundException {
- return (getItem(new DomainPath(path)));
+ public ItemProxy getItem(String itemPath) throws ObjectNotFoundException {
+ return (getItem(new DomainPath(itemPath)));
}
- public ItemProxy getItem(Path path) throws ObjectNotFoundException {
- return (ItemProxy)Gateway.getProxyManager().getProxy(path);
+ public ItemProxy getItem(Path itemPath) throws ObjectNotFoundException {
+ return (ItemProxy)Gateway.getProxyManager().getProxy(itemPath);
}
public ItemProxy getItemBySysKey(int sysKey) throws ObjectNotFoundException, InvalidEntityPathException {
diff --git a/src/main/java/com/c2kernel/utils/ActDefCache.java b/src/main/java/com/c2kernel/utils/ActDefCache.java
index 1345e25..2ee5c7c 100644
--- a/src/main/java/com/c2kernel/utils/ActDefCache.java
+++ b/src/main/java/com/c2kernel/utils/ActDefCache.java
@@ -84,8 +84,8 @@ public class ActDefCache {
}
@Override
- public void remove(String id) {
- parent.removeAct(id);
+ public void remove(String oldId) {
+ parent.removeAct(oldId);
}
@Override