Changeset 5655

Timestamp:

09/18/14 14:02:58 (10 years ago)

Author:

Oliver Schonefeld

Message:

• spray some @SuppressWarnings? across the code to silence warnings about missing serialization id
• remove some superfluous @SuppressWarnings?
• clean up some imports

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry

Files:

• gui/DynamicProxyModel.java (modified) (1 diff)
• gui/HandleLinkModel.java (modified) (2 diffs)
• gui/TooltipBehavior.java (modified) (1 diff)
• gui/VolatileEntityModel.java (modified) (2 diffs)
• gui/pages/BrowseEditableCollectionsPanel.java (modified) (2 diffs)
• gui/pages/BrowsePrivateCollectionsPage.java (modified) (1 diff)
• gui/pages/MenuItem.java (modified) (2 diffs)
• gui/pages/ReferenceLinkPanel.java (modified) (2 diffs)
• gui/table/AdminCollectionsProvider.java (modified) (2 diffs)
• gui/table/FilterForm.java (modified) (1 diff)
• gui/table/PrivateCollectionsProvider.java (modified) (1 diff)
• gui/table/PublishedCollectionsProvider.java (modified) (1 diff)
• service/impl/ReferenceValidator.java (modified) (2 diffs)
• service/impl/VirtualCollectionCMDICreatorImpl.java (modified) (3 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/DynamicProxyModel.java

@@ -11 +11 @@
  * @param <T> type of model object
  */
+@SuppressWarnings("serial")
 public abstract class DynamicProxyModel<T> implements IModel<T> {
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/HandleLinkModel.java

@@ -19 +19 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.apache.wicket.model.IModel;
 
@@ -27 +28 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class HandleLinkModel implements IModel<String> {
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/TooltipBehavior.java

@@ -16 +16 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class TooltipBehavior extends WiQueryAbstractBehavior {
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/VolatileEntityModel.java

@@ -2 +2 @@
 
 import eu.clarin.cmdi.virtualcollectionregistry.model.IdentifiedEntity;
+
 import java.io.Serializable;
+
 import javax.persistence.EntityManager;
+
 import org.apache.wicket.model.IModel;
 import org.slf4j.Logger;
@@ -18 +21 @@
  * @see EntityManager#merge(java.lang.Object)
  */
+@SuppressWarnings("serial")
 public class VolatileEntityModel<T extends IdentifiedEntity & Serializable> implements IModel<T> {
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowseEditableCollectionsPanel.java

@@ -12 +12 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
 import eu.clarin.cmdi.virtualcollectionregistry.service.VirtualCollectionValidator;
+
 import java.security.Principal;
 import java.util.Collections;
 import java.util.List;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.PageParameters;
@@ -34 +36 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class BrowseEditableCollectionsPanel extends Panel {
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/BrowsePrivateCollectionsPage.java

@@ -6 +6 @@
 
 @AuthorizeInstantiation(Roles.USER)
-@SuppressWarnings("serial")
 public class BrowsePrivateCollectionsPage extends BasePage {
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/MenuItem.java

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.gui.pages;
 
-import eu.clarin.cmdi.virtualcollectionregistry.gui.Application;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.authorization.IAuthorizationStrategy;
@@ -12 +11 @@
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
 import org.apache.wicket.util.lang.Classes;
+
+import eu.clarin.cmdi.virtualcollectionregistry.gui.Application;
 
 @SuppressWarnings("serial")

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/pages/ReferenceLinkPanel.java

@@ -3 +3 @@
 import eu.clarin.cmdi.virtualcollectionregistry.gui.HandleLinkModel;
 import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
+
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.markup.html.basic.Label;
@@ -16 +17 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class ReferenceLinkPanel extends Panel {
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/AdminCollectionsProvider.java

@@ -4 +4 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.User;
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
+
 import org.apache.wicket.model.IModel;
 
@@ -14 +15 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class AdminCollectionsProvider extends CollectionsProvider {
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/FilterForm.java

@@ -14 +14 @@
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.CompoundPropertyModel;

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/PrivateCollectionsProvider.java

@@ -8 +8 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class PrivateCollectionsProvider extends CollectionsProvider {
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/gui/table/PublishedCollectionsProvider.java

@@ -8 +8 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class PublishedCollectionsProvider extends CollectionsProvider {
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/ReferenceValidator.java

@@ -18 +18 @@
 
 import java.util.regex.Pattern;
+
 import org.apache.wicket.validation.IValidatable;
 import org.apache.wicket.validation.IValidator;
@@ -32 +33 @@
  * @author twagoo
  */
+@SuppressWarnings("serial")
 public class ReferenceValidator extends AbstractValidator<String> {
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionCMDICreatorImpl.java

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.service.impl;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
 
 import eu.clarin.cmdi.virtualcollectionregistry.model.Creator;
@@ -5 +20 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
-import static eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection.State.DEAD;
-import static eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection.State.DELETED;
-import static eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection.State.PUBLIC;
 import eu.clarin.cmdi.virtualcollectionregistry.model.cmdi.CMD;
 import eu.clarin.cmdi.virtualcollectionregistry.model.cmdi.CMD.Components.VirtualCollection.Creator.Email;
@@ -26 +38 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.cmdi.SimpletypeStatus1;
 import eu.clarin.cmdi.virtualcollectionregistry.service.VirtualCollectionCMDICreator;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.datatype.DatatypeFactory;
-import javax.xml.datatype.XMLGregorianCalendar;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang3.time.FastDateFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
 
 /**