Revision: 1849
Author: [email protected]
Date: Tue Feb 16 01:53:18 2010
Log: Fixed a few FindBugs and PMD warnings, also updated config in pom.xmls
to fix running PMD locally.
http://code.google.com/p/simal/source/detail?r=1849
Modified:
/trunk/uk.ac.osswatch.simal.core/src/main/java/uk/ac/osswatch/simal/model/AbstractResource.java
/trunk/uk.ac.osswatch.simal.rest/pom.xml
/trunk/uk.ac.osswatch.simal.web/pom.xml
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/panel/PersonListPanel.java
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/InstantiateWidgetPage.java
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/Widget.java
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/WookieWidgetGalleryPanel.java
=======================================
---
/trunk/uk.ac.osswatch.simal.core/src/main/java/uk/ac/osswatch/simal/model/AbstractResource.java
Tue Nov 24 16:08:08 2009
+++
/trunk/uk.ac.osswatch.simal.core/src/main/java/uk/ac/osswatch/simal/model/AbstractResource.java
Tue Feb 16 01:53:18 2010
@@ -104,7 +104,7 @@
}
protected void setPath(URI uri) {
- path = "/" + uri.getHost() + uri.getPath();
+ // path = "/" + uri.getHost() + uri.getPath();
path = "/myFolder";
}
=======================================
--- /trunk/uk.ac.osswatch.simal.rest/pom.xml Mon Nov 30 16:36:24 2009
+++ /trunk/uk.ac.osswatch.simal.rest/pom.xml Tue Feb 16 01:53:18 2010
@@ -170,9 +170,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
- <compilerVersion>1.5</compilerVersion>
+ <source>${compile.source}</source>
+ <target>${compile.source}</target>
+ <compilerVersion>${compile.source}</compilerVersion>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
@@ -243,6 +243,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>${compile.source}</targetJdk>
+ </configuration>
</plugin>
<plugin>
@@ -255,6 +258,10 @@
</plugins>
</reporting>
+ <properties>
+ <compile.source>1.5</compile.source>
+ </properties>
+
<!-- Developers listed alphabetically -->
<developers>
<developer>
=======================================
--- /trunk/uk.ac.osswatch.simal.web/pom.xml Thu Feb 4 01:17:42 2010
+++ /trunk/uk.ac.osswatch.simal.web/pom.xml Tue Feb 16 01:53:18 2010
@@ -261,9 +261,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
- <compilerVersion>1.5</compilerVersion>
+ <source>${compile.source}</source>
+ <target>${compile.source}</target>
+ <compilerVersion>${compile.source}</compilerVersion>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
@@ -340,6 +340,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>${compile.source}</targetJdk>
+ </configuration>
</plugin>
<plugin>
@@ -354,6 +357,7 @@
</reporting>
<properties>
+ <compile.source>1.5</compile.source>
<wicket.version>1.4.3</wicket.version>
<jetty.version>6.1.18</jetty.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/panel/PersonListPanel.java
Fri Dec 11 13:44:43 2009
+++
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/panel/PersonListPanel.java
Tue Feb 16 01:53:18 2010
@@ -144,8 +144,6 @@
@Override
public void populateItem(Item cellItem, String componentId, IModel
model) {
- IPerson person = (IPerson)model.getObject();
- Set<IInternetAddress> emailSet = person.getEmail();
Iterator<IInternetAddress> emails =
((IPerson)model.getObject()).getEmail().iterator();
if (emails.hasNext()) {
while (emails.hasNext()) {
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/InstantiateWidgetPage.java
Sun Dec 13 15:18:48 2009
+++
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/InstantiateWidgetPage.java
Tue Feb 16 01:53:18 2010
@@ -20,9 +20,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import org.apache.wicket.Page;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.IPageLink;
import org.apache.wicket.markup.html.link.Link;
import uk.ac.osswatch.simal.wicket.BasePage;
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/Widget.java
Sun Dec 13 15:18:48 2009
+++
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/Widget.java
Tue Feb 16 01:53:18 2010
@@ -96,7 +96,7 @@
* An instance of this widget.
*
*/
- public class Instance {
+ public static class Instance {
String url;
String id;
=======================================
---
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/WookieWidgetGalleryPanel.java
Thu Dec 17 13:42:01 2009
+++
/trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/widgets/WookieWidgetGalleryPanel.java
Tue Feb 16 01:53:18 2010
@@ -39,7 +39,6 @@
*/
public class WookieWidgetGalleryPanel extends Panel {
private static final long serialVersionUID = 1L;
- private static final Logger logger =
LoggerFactory.getLogger(WookieWidgetGalleryPanel.class);
/**
* Create a default Wookie Widget gallery panel that will display all the
@@ -85,7 +84,9 @@
add(repeating);
}
- public class StaticImage extends WebComponent {
+ public static class StaticImage extends WebComponent {
+
+ private static final long serialVersionUID = -8331551149365773888L;
public StaticImage(String id, IModel model) {
super(id, model);
--
You received this message because you are subscribed to the Google Groups "Simal
Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/simal-commits?hl=en.
