Author: jawi
Date: Fri Feb 19 08:58:50 2016
New Revision: 1731202
URL: http://svn.apache.org/viewvc?rev=1731202&view=rev
Log:
Some compiler warnings and IDE warnings fixed:
- remove redundant warnings regarding the use of raw types; we can explain to Eclipse that
these are unavoidable;
- fix the classpath settings for the Eclipse project files so that the test/ directories are
properly included.
Modified:
ace/trunk/org.apache.ace.agent.itest/.classpath
ace/trunk/org.apache.ace.useradmin.ui.itest/.classpath
ace/trunk/org.apache.ace.useradmin/repository.bnd
ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/RepositoryBasedRoleRepositoryStore.java
ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/RepositoryUser.java
ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/xstream/PropertiesConverter.java
ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd
ace/trunk/run-client/.classpath
ace/trunk/run-develop/.classpath
ace/trunk/run-obr/.classpath
ace/trunk/run-server-allinone/.classpath
ace/trunk/run-server/.classpath
ace/trunk/run-target/.classpath
Modified: ace/trunk/org.apache.ace.agent.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.agent.itest/.classpath?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.agent.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.agent.itest/.classpath Fri Feb 19 08:58:50 2016
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="bin" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="src" output="bin_test" path="test"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.useradmin.ui.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin.ui.itest/.classpath?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin.ui.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.useradmin.ui.itest/.classpath Fri Feb 19 08:58:50 2016
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="src" output="bin" path="src"/>
+ <classpathentry kind="src" output="bin_test" path="test"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.useradmin/repository.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin/repository.bnd?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin/repository.bnd (original)
+++ ace/trunk/org.apache.ace.useradmin/repository.bnd Fri Feb 19 08:58:50 2016
@@ -19,7 +19,6 @@ Private-Package: \
org.xmlpull.v1.util,\
org.xmlpull.v1.wrapper,\
org.xmlpull.v1.wrapper.classic,\
- org.apache.ace.client.repository.stateful.impl,\
org.apache.ace.repository.ext,\
org.apache.ace.repository.ext.impl,\
com.thoughtworks.xstream,\
Modified: ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/RepositoryBasedRoleRepositoryStore.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/RepositoryBasedRoleRepositoryStore.java?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/RepositoryBasedRoleRepositoryStore.java
(original)
+++ ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/RepositoryBasedRoleRepositoryStore.java
Fri Feb 19 08:58:50 2016
@@ -87,7 +87,6 @@ public class RepositoryBasedRoleReposito
m_cachedRepository = new CachedRepositoryImpl(m_repository, backupRepo, CachedRepositoryImpl.UNCOMMITTED_VERSION);
}
- @SuppressWarnings("unchecked")
private void refreshRoleMap() throws Exception {
m_roleMap.clear();
XStream instance = XStreamFactory.getInstance();
@@ -183,7 +182,6 @@ public class RepositoryBasedRoleReposito
}
}
- @SuppressWarnings("unchecked")
@Override
public Role[] getRoles(String filterString) throws Exception {
synchronized (m_roleMap) {
Modified: ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/RepositoryUser.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/RepositoryUser.java?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/RepositoryUser.java
(original)
+++ ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/RepositoryUser.java
Fri Feb 19 08:58:50 2016
@@ -51,13 +51,11 @@ public class RepositoryUser implements U
return m_delegate.getType();
}
- @SuppressWarnings("rawtypes")
@Override
public Dictionary getProperties() {
return new RepoProperties(m_delegate.getProperties());
}
- @SuppressWarnings("rawtypes")
@Override
public Dictionary getCredentials() {
return new RepoProperties(m_delegate.getCredentials());
Modified: ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/xstream/PropertiesConverter.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/xstream/PropertiesConverter.java?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/xstream/PropertiesConverter.java
(original)
+++ ace/trunk/org.apache.ace.useradmin/src/org/apache/ace/useradmin/repository/xstream/PropertiesConverter.java
Fri Feb 19 08:58:50 2016
@@ -30,7 +30,7 @@ import com.thoughtworks.xstream.io.Hiera
public class PropertiesConverter implements Converter {
@Override
- public boolean canConvert(@SuppressWarnings("rawtypes") Class clazz) {
+ public boolean canConvert(Class clazz) {
return Properties.class.isAssignableFrom(clazz);
}
Modified: ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd (original)
+++ ace/trunk/org.apache.ace.webui.vaadin/bnd.bnd Fri Feb 19 08:58:50 2016
@@ -24,7 +24,7 @@ Private-Package: \
org.kxml2.io,\
org.osgi.impl.bundle.bindex,\
org.osgi.impl.bundle.obr.resource,\
- org.osgi.service.bindex*,\
+ org.osgi.service.bindex*;-split-package:=merge-last,\
org.osgi.service.indexer*,\
org.osgi.service.obr,\
org.osgi.service.repository*,\
Modified: ace/trunk/run-client/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/run-client/.classpath?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/run-client/.classpath (original)
+++ ace/trunk/run-client/.classpath Fri Feb 19 08:58:50 2016
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" output="bin" path="src"/>
+ <classpathentry kind="src" output="bin_test" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
Modified: ace/trunk/run-develop/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/run-develop/.classpath?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/run-develop/.classpath (original)
+++ ace/trunk/run-develop/.classpath Fri Feb 19 08:58:50 2016
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" output="bin" path="src"/>
+ <classpathentry kind="src" output="bin_test" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
Modified: ace/trunk/run-obr/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/run-obr/.classpath?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/run-obr/.classpath (original)
+++ ace/trunk/run-obr/.classpath Fri Feb 19 08:58:50 2016
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" output="bin" path="src"/>
+ <classpathentry kind="src" output="bin_test" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
Modified: ace/trunk/run-server-allinone/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/run-server-allinone/.classpath?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/run-server-allinone/.classpath (original)
+++ ace/trunk/run-server-allinone/.classpath Fri Feb 19 08:58:50 2016
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" output="bin" path="src"/>
+ <classpathentry kind="src" output="bin_test" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
Modified: ace/trunk/run-server/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/.classpath?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/run-server/.classpath (original)
+++ ace/trunk/run-server/.classpath Fri Feb 19 08:58:50 2016
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" output="bin" path="src"/>
+ <classpathentry kind="src" output="bin_test" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
Modified: ace/trunk/run-target/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/run-target/.classpath?rev=1731202&r1=1731201&r2=1731202&view=diff
==============================================================================
--- ace/trunk/run-target/.classpath (original)
+++ ace/trunk/run-target/.classpath Fri Feb 19 08:58:50 2016
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" output="bin" path="src"/>
+ <classpathentry kind="src" output="bin_test" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
|