Author: scottbw
Date: Fri Jun 8 10:39:33 2012
New Revision: 1348011
URL: http://svn.apache.org/viewvc?rev=1348011&view=rev
Log:
Removed deprecated methods from IWidget and the JPA and JCR implementations -
see WOOKIE-344
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java?rev=1348011&r1=1348010&r2=1348011&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java
Fri Jun 8 10:39:33 2012
@@ -109,9 +109,6 @@ public class WidgetImpl extends Localize
public void setPackagePath(String path) {
packagePath = path;
}
-
-
-
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getDescriptions()
@@ -582,54 +579,7 @@ public class WidgetImpl extends Localize
this.version = version;
}
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetAuthor()
- */
- public String getWidgetAuthor()
- {
- return getOrCreateAuthor().getAuthor();
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#setWidgetAuthor(java.lang.String)
- */
- public void setWidgetAuthor(String widgetAuthor)
- {
- getOrCreateAuthor().setAuthor(widgetAuthor);
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetAuthorEmail()
- */
- public String getWidgetAuthorEmail()
- {
- return getOrCreateAuthor().getEmail();
- }
-
- /* (non-Javadoc)
- * @see
org.apache.wookie.beans.IWidget#setWidgetAuthorEmail(java.lang.String)
- */
- public void setWidgetAuthorEmail(String widgetAuthorEmail)
- {
- getOrCreateAuthor().setEmail(widgetAuthorEmail);
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetAuthorHref()
- */
- public String getWidgetAuthorHref()
- {
- return getOrCreateAuthor().getHref();
- }
-
- /* (non-Javadoc)
- * @see
org.apache.wookie.beans.IWidget#setWidgetAuthorHref(java.lang.String)
- */
- public void setWidgetAuthorHref(String widgetAuthorHref)
- {
- getOrCreateAuthor().setHref(widgetAuthorHref);
- }
-
+
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getWidgetIcons()
*/
@@ -694,52 +644,12 @@ public class WidgetImpl extends Localize
}
/* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetDescription()
- */
- public String getWidgetDescription()
- {
- return Utilities.getWidgetDescription(this, "en");
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetShortName()
- */
- public String getWidgetShortName()
- {
- return Utilities.getWidgetShortName(this, "en");
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetTitle()
- */
- public String getWidgetTitle()
- {
- return Utilities.getWidgetTitle(this, "en");
- }
-
- /* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getWidgetTitle(java.lang.String)
*/
public String getWidgetTitle(String locale)
{
return Utilities.getWidgetTitle(this, locale);
}
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getUrl()
- */
- public String getUrl()
- {
- return Utilities.getUrl(this, "en");
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetIconLocation()
- */
- public String getWidgetIconLocation()
- {
- return Utilities.getWidgetIconLocation(this, "en");
- }
public String getDefaultLocale(){
return this.defaultLocale;
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java?rev=1348011&r1=1348010&r2=1348011&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java Fri Jun 8
10:39:33 2012
@@ -118,54 +118,6 @@ public interface IWidget extends ILocali
void setAuthor(IAuthor author);
/**
- * Get widget author.
- *
- * @return widget author
- */
- @Deprecated
- String getWidgetAuthor();
-
- /**
- * Set widget author.
- *
- * @param widgetAuthor widget author
- */
- @Deprecated
- void setWidgetAuthor(String widgetAuthor);
-
- /**
- * Get widget author email address.
- *
- * @return widget author email
- */
- @Deprecated
- String getWidgetAuthorEmail();
-
- /**
- * Set widget author email address.
- *
- * @param widgetAuthorEmail widget author email
- */
- @Deprecated
- void setWidgetAuthorEmail(String widgetAuthorEmail);
-
- /**
- * Get widget author web page href URL.
- *
- * @return widget author href
- */
- @Deprecated
- String getWidgetAuthorHref();
-
- /**
- * Set widget author web page href URL.
- *
- * @param widgetAuthorHref widget author href
- */
- @Deprecated
- void setWidgetAuthorHref(String widgetAuthorHref);
-
- /**
* Get widget version number.
*
* @return widget version
@@ -278,14 +230,6 @@ public interface IWidget extends ILocali
void setPreferenceDefaults(Collection<IPreferenceDefault>
preferenceDefaults);
/**
- * Get default widget title, (deprecated in favor of locale specifying
APIs).
- *
- * @return widget title
- */
- @Deprecated
- String getWidgetTitle();
-
- /**
* Get widget title for locale.
*
* @return widget title
@@ -293,38 +237,6 @@ public interface IWidget extends ILocali
String getWidgetTitle(String locale);
/**
- * Get default widget description, (deprecated in favor of locale
specifying APIs).
- *
- * @return widget description
- */
- @Deprecated
- String getWidgetDescription();
-
- /**
- * Get default widget short name, (deprecated in favor of locale
specifying APIs).
- *
- * @return widget short name
- */
- @Deprecated
- String getWidgetShortName();
-
- /**
- * Get default start file url, (deprecated in favor of locale specifying
APIs).
- *
- * @return start file url
- */
- @Deprecated
- String getUrl();
-
- /**
- * Get default widget icon location, (deprecated in favor of locale
specifying APIs).
- *
- * @return widget icon location
- */
- @Deprecated
- String getWidgetIconLocation();
-
- /**
* Shared implementation utilities.
*/
public static class Utilities
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java?rev=1348011&r1=1348010&r2=1348011&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
Fri Jun 8 10:39:33 2012
@@ -397,54 +397,6 @@ public class WidgetImpl extends Localize
}
/* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetAuthor()
- */
- public String getWidgetAuthor()
- {
- return getOrCreateAuthor().getAuthor();
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#setWidgetAuthor(java.lang.String)
- */
- public void setWidgetAuthor(String widgetAuthor)
- {
- this.getOrCreateAuthor().setAuthor(widgetAuthor);
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetAuthorEmail()
- */
- public String getWidgetAuthorEmail()
- {
- return getOrCreateAuthor().getEmail();
- }
-
- /* (non-Javadoc)
- * @see
org.apache.wookie.beans.IWidget#setWidgetAuthorEmail(java.lang.String)
- */
- public void setWidgetAuthorEmail(String widgetAuthorEmail)
- {
- this.getOrCreateAuthor().setEmail(widgetAuthorEmail);
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetAuthorHref()
- */
- public String getWidgetAuthorHref()
- {
- return getOrCreateAuthor().getHref();
- }
-
- /* (non-Javadoc)
- * @see
org.apache.wookie.beans.IWidget#setWidgetAuthorHref(java.lang.String)
- */
- public void setWidgetAuthorHref(String widgetAuthorHref)
- {
- this.getOrCreateAuthor().setHref(widgetAuthorHref);
- }
-
- /* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getWidgetIcons()
*/
public Collection<IWidgetIcon> getWidgetIcons()
@@ -488,30 +440,6 @@ public class WidgetImpl extends Localize
}
/* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetDescription()
- */
- public String getWidgetDescription()
- {
- return Utilities.getWidgetDescription(this, "en");
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetShortName()
- */
- public String getWidgetShortName()
- {
- return Utilities.getWidgetShortName(this, "en");
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetTitle()
- */
- public String getWidgetTitle()
- {
- return Utilities.getWidgetTitle(this, "en");
- }
-
- /* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getWidgetTitle(java.lang.String)
*/
public String getWidgetTitle(String locale)
@@ -519,21 +447,6 @@ public class WidgetImpl extends Localize
return Utilities.getWidgetTitle(this, locale);
}
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getUrl()
- */
- public String getUrl()
- {
- return Utilities.getUrl(this, "en");
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetIconLocation()
- */
- public String getWidgetIconLocation()
- {
- return Utilities.getWidgetIconLocation(this, "en");
- }
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getPackagePath()
