Author: scottbw
Date: Fri Jun 8 14:59:12 2012
New Revision: 1348099
URL: http://svn.apache.org/viewvc?rev=1348099&view=rev
Log:
Harmonized Name interfaces, See WOOKIE-345
Modified:
incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/WidgetAPIImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IName.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/NameImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetAdvertHelper.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
incubator/wookie/trunk/src/org/apache/wookie/util/WidgetFormattingUtils.java
Modified:
incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/WidgetAPIImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/WidgetAPIImpl.java?rev=1348099&r1=1348098&r2=1348099&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/WidgetAPIImpl.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/ajaxmodel/impl/WidgetAPIImpl.java
Fri Jun 8 14:59:12 2012
@@ -97,7 +97,7 @@ public class WidgetAPIImpl implements IW
IName iname =
(IName)LocalizationUtils.getLocalizedElement(widget.getNames().toArray(new
IName[widget.getNames().size()]), locales, widget.getDefaultLocale());
if (iname != null && iname.getName() != null) name =
WidgetFormattingUtils.getEncoded(iname.getDir(), iname.getName());
String shortName = "";
- if (iname != null && iname.getShortName() != null) shortName =
WidgetFormattingUtils.getEncoded(iname.getDir(), iname.getShortName());
+ if (iname != null && iname.getShort() != null) shortName =
WidgetFormattingUtils.getEncoded(iname.getDir(), iname.getShort());
String description = "";
IDescription idescription =
(IDescription)LocalizationUtils.getLocalizedElement(widget.getDescriptions().toArray(new
IDescription[widget.getDescriptions().size()]), locales,
widget.getDefaultLocale());
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/IName.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/IName.java?rev=1348099&r1=1348098&r2=1348099&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/IName.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/IName.java Fri Jun 8
14:59:12 2012
@@ -28,14 +28,14 @@ public interface IName extends ILocalize
*
* @return short name
*/
- String getShortName();
+ String getShort();
/**
* Set widget short name.
*
* @param shortName short name
*/
- void setShortName(String shortName);
+ void setShort(String shortName);
/**
* Get widget name.
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/NameImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/NameImpl.java?rev=1348099&r1=1348098&r2=1348099&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/NameImpl.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/NameImpl.java
Fri Jun 8 14:59:12 2012
@@ -90,7 +90,7 @@ public class NameImpl extends LocalizedB
/* (non-Javadoc)
* @see org.apache.wookie.beans.IName#getShortName()
*/
- public String getShortName()
+ public String getShort()
{
return shortName;
}
@@ -98,7 +98,7 @@ public class NameImpl extends LocalizedB
/* (non-Javadoc)
* @see org.apache.wookie.beans.IName#setShortName(java.lang.String)
*/
- public void setShortName(String shortName)
+ public void setShort(String shortName)
{
this.shortName = shortName;
}
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java?rev=1348099&r1=1348098&r2=1348099&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
Fri Jun 8 14:59:12 2012
@@ -99,7 +99,7 @@ public class PersistenceManagerFactory
widget.setVersion("v1.0");
IName widgetName =
persistenceManager.newInstance(IName.class);
widgetName.setName("Unsupported widget widget");
- widgetName.setShortName("Unsupported");
+ widgetName.setShort("Unsupported");
widget.getNames().add(widgetName);
IDescription widgetDescription =
persistenceManager.newInstance(IDescription.class);
widgetDescription.setDescription("This widget is a
placeholder for when no corresponding widget is found for a given type");
Modified:
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetAdvertHelper.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetAdvertHelper.java?rev=1348099&r1=1348098&r2=1348099&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetAdvertHelper.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetAdvertHelper.java
Fri Jun 8 14:59:12 2012
@@ -146,7 +146,7 @@ public class WidgetAdvertHelper {
String shortName = null;
String longName = null;
if (name != null) {
- shortName = name.getShortName();
+ shortName = name.getShort();
longName = name.getName();
}
String out = "\t\t<name ";
Modified:
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java?rev=1348099&r1=1348098&r2=1348099&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java Fri
Jun 8 14:59:12 2012
@@ -145,7 +145,7 @@ public class WidgetFactory {
widgetName.setLang(name.getLang());
widgetName.setDir(name.getDir());
widgetName.setName(name.getName());
- widgetName.setShortName(name.getShort());
+ widgetName.setShort(name.getShort());
widget.getNames().add(widgetName);
}
}
Modified:
incubator/wookie/trunk/src/org/apache/wookie/util/WidgetFormattingUtils.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/util/WidgetFormattingUtils.java?rev=1348099&r1=1348098&r2=1348099&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/util/WidgetFormattingUtils.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/util/WidgetFormattingUtils.java
Fri Jun 8 14:59:12 2012
@@ -43,7 +43,7 @@ public class WidgetFormattingUtils exten
* @return a CSS-formatted i18n string
*/
public static String getFormattedWidgetShortName(IName name){
- return getFormatted(name.getDir(), name.getShortName());
+ return getFormatted(name.getDir(), name.getShort());
}
/**
* Returns the CSS formatted i18n string for the widget version
