Author: ross.gardler
Date: Sun Sep 7 14:02:45 2008
New Revision: 1281
Modified:
trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/doap/ExhibitProjectBrowserPage.java
trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/doap/ProjectDetailPage.java
Log:
Fix a few findbugs warnings and remove a horrible hack that resulted in the
JSON functionality breaking when the CSS files were moved.
Modified:
trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/doap/ExhibitProjectBrowserPage.java
==============================================================================
---
trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/doap/ExhibitProjectBrowserPage.java
(original)
+++
trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/doap/ExhibitProjectBrowserPage.java
Sun Sep 7 14:02:45 2008
@@ -19,12 +19,13 @@
import java.io.File;
import java.io.FileWriter;
-import java.net.URL;
+import java.io.IOException;
import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.behavior.StringHeaderContributor;
import org.apache.wicket.markup.html.resources.CompressedResourceReference;
+import uk.ac.osswatch.simal.rdf.SimalRepositoryException;
import uk.ac.osswatch.simal.wicket.BasePage;
import uk.ac.osswatch.simal.wicket.ErrorReportPage;
import uk.ac.osswatch.simal.wicket.UserApplication;
@@ -41,16 +42,19 @@
BasePage.class, "style/exhibit.css");
public ExhibitProjectBrowserPage() {
- URL dir = UserApplication.class.getResource(DEFAULT_CSS_LOC);
+ String dir = System.getProperty("java.io.tmpdir");
try {
- File outFile = new File(new
File(dir.toURI()).getParent() +
File.separator + "projects.js");
+ File outFile = new File(dir + "projects.js");
FileWriter out = new FileWriter(outFile);
out.write(UserApplication.getRepository().getAllProjectsAsJSON());
out.close();
- } catch (Exception e) {
+ } catch (IOException e) {
UserReportableException error = new
UserReportableException("Unable to
write JSON file", ExhibitProjectBrowserPage.class, e);
setResponsePage(new ErrorReportPage(error));
- }
+ } catch (SimalRepositoryException e) {
+ UserReportableException error = new UserReportableException("Unable
to retrieve necessary data from the repository",
ExhibitProjectBrowserPage.class, e);
+ setResponsePage(new ErrorReportPage(error));
+ }
add(HeaderContributor.forCss(EXHIBIT_CSS));
add(HeaderContributor
.forJavaScript("http://static.simile.mit.edu/exhibit/api-2.0/exhibit-api.js";));
Modified:
trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/doap/ProjectDetailPage.java
==============================================================================
---
trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/doap/ProjectDetailPage.java
(original)
+++
trunk/uk.ac.osswatch.simal.web/src/main/java/uk/ac/osswatch/simal/wicket/doap/ProjectDetailPage.java
Sun Sep 7 14:02:45 2008
@@ -77,21 +77,8 @@
private void populatePage(final IProject project) {
this.project = project;
-
- final Link deleteProjectActionLink = new
Link("deleteProjectActionLink") {
- private static final long serialVersionUID = 2387446194207003694L;
-
- public void onClick() {
- try {
- project.delete();
- getRequestCycle().setResponsePage(new UserHomePage());
- } catch (SimalRepositoryException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- }
- };
- add(deleteProjectActionLink);
+
+ add(new DeleteLink("deleteProjectActionLink", project));
try {
RESTCommand cmd = RESTCommand.createGetProject(project.getSimalID(),
RESTCommand.TYPE_SIMAL, RESTCommand.FORMAT_XML);
@@ -224,6 +211,27 @@
public IProject getProject() {
return project;
+ }
+
+ private static class DeleteLink extends Link<IProject> {
+ IProject project;
+
+ public DeleteLink(String id, IProject project) {
+ super(id);
+ this.project = project;
+ }
+
+ private static final long serialVersionUID = 1L;
+
+ public void onClick() {
+ try {
+ project.delete();
+ getRequestCycle().setResponsePage(new UserHomePage());
+ } catch (SimalRepositoryException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
}
}
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
