Author: adrianc
Date: Sat Nov 1 15:13:12 2014
New Revision: 1635964
URL: http://svn.apache.org/r1635964
Log:
Remove unused rawString method from screen widgets. I will be committing a
widget visitor soon, so if anyone really wants to generate screen widget XML
they can create a visitor implementation for it.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java?rev=1635964&r1=1635963&r2=1635964&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/HtmlWidget.java
Sat Nov 1 15:13:12 2014
@@ -130,16 +130,6 @@ public class HtmlWidget extends ModelScr
}
}
- @Override
- public String rawString() {
- StringBuilder buffer = new StringBuilder("<html-widget>");
- for (ModelScreenWidget subWidget : subWidgets) {
- buffer.append(subWidget.rawString());
- }
- buffer.append("</html-widget>");
- return buffer.toString();
- }
-
public static void renderHtmlTemplate(Appendable writer,
FlexibleStringExpander locationExdr, Map<String, Object> context) {
String location = locationExdr.expandString(context);
//Debug.logInfo("Rendering template at location [" + location + "]
with context: \n" + context, module);
@@ -210,11 +200,6 @@ public class HtmlWidget extends ModelScr
public void renderWidgetString(Appendable writer, Map<String, Object>
context, ScreenStringRenderer screenStringRenderer) {
renderHtmlTemplate(writer, this.locationExdr, context);
}
-
- @Override
- public String rawString() {
- return "<html-template location=\"" +
this.locationExdr.getOriginal() + "\"/>";
- }
}
public static class HtmlTemplateDecorator extends ModelScreenWidget {
@@ -255,11 +240,6 @@ public class HtmlWidget extends ModelScr
renderHtmlTemplate(writer, this.locationExdr, context);
contextMs.pop();
}
-
- @Override
- public String rawString() {
- return "<html-template-decorator location=\"" +
this.locationExdr.getOriginal() + "\"/>";
- }
}
public static class HtmlTemplateDecoratorSection extends ModelScreenWidget
{
@@ -279,10 +259,5 @@ public class HtmlWidget extends ModelScr
// render sub-widgets
renderSubWidgetsString(this.subWidgets, writer, context,
screenStringRenderer);
}
-
- @Override
- public String rawString() {
- return "<html-template-decorator-section name=\"" + this.name +
"\"/>";
- }
}
}
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java?rev=1635964&r1=1635963&r2=1635964&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/IterateSectionWidget.java
Sat Nov 1 15:13:12 2014
@@ -413,12 +413,6 @@ public class IterateSectionWidget extend
writer.append("</table>\n");
}
-
- @Override
- public String rawString() {
- // TODO: something more than the empty tag
- return "<iterate-section/>";
- }
}
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java?rev=1635964&r1=1635963&r2=1635964&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java
Sat Nov 1 15:13:12 2014
@@ -79,8 +79,6 @@ public abstract class ModelScreenWidget
public abstract void renderWidgetString(Appendable writer, Map<String,
Object> context, ScreenStringRenderer screenStringRenderer) throws
GeneralException, IOException;
- public abstract String rawString();
-
protected static List<ModelScreenWidget> readSubWidgets(ModelScreen
modelScreen, List<? extends Element> subElementList) {
if (subElementList.isEmpty()) {
return Collections.emptyList();
@@ -312,11 +310,6 @@ public abstract class ModelScreenWidget
public boolean isMainSection() {
return isMainSection;
}
-
- @Override
- public String rawString() {
- return "<section name=\"" + getName() + "\">";
- }
}
public static final class ColumnContainer extends ModelScreenWidget {
@@ -359,11 +352,6 @@ public abstract class ModelScreenWidget
public String getStyle(Map<String, Object> context) {
return this.styleExdr.expandString(context);
}
-
- @Override
- public String rawString() {
- return "<column-container id=\"" + this.idExdr.getOriginal() + "\"
style=\"" + this.styleExdr.getOriginal() + "\">";
- }
}
public static final class Column {
@@ -449,11 +437,6 @@ public abstract class ModelScreenWidget
public List<ModelScreenWidget> getSubWidgets() {
return subWidgets;
}
-
- @Override
- public String rawString() {
- return "<container id=\"" + this.idExdr.getOriginal() + "\"
style=\"" + this.styleExdr.getOriginal() + "\" auto-update-target=\"" +
this.autoUpdateTargetExdr.getOriginal() + "\">";
- }
}
public static final class Screenlet extends ModelScreenWidget {
@@ -611,11 +594,6 @@ public abstract class ModelScreenWidget
public Menu getTabMenu() {
return this.tabMenu;
}
-
- @Override
- public String rawString() {
- return "<screenlet id=\"" + this.idExdr.getOriginal() + "\"
title=\"" + this.titleExdr.getOriginal() + "\">";
- }
}
public static final class HorizontalSeparator extends ModelScreenWidget {
@@ -641,11 +619,6 @@ public abstract class ModelScreenWidget
public String getStyle(Map<String, Object> context) {
return this.styleExdr.expandString(context);
}
-
- @Override
- public String rawString() {
- return "<horizontal-separator id=\"" + this.idExdr.getOriginal() +
"\" name=\"" + this.idExdr.getOriginal() + "\" style=\"" +
this.styleExdr.getOriginal() + "\">";
- }
}
public static final class IncludeScreen extends ModelScreenWidget {
@@ -712,11 +685,6 @@ public abstract class ModelScreenWidget
// defaults to false, so anything but true is false
return "true".equals(shareScopeString);
}
-
- @Override
- public String rawString() {
- return "<include-screen name=\"" + this.nameExdr.getOriginal() +
"\" location=\"" + this.locationExdr.getOriginal() + "\" share-scope=\"" +
this.shareScopeExdr.getOriginal() + "\"/>";
- }
}
public static final class DecoratorScreen extends ModelScreenWidget {
@@ -776,11 +744,6 @@ public abstract class ModelScreenWidget
public Map<String, DecoratorSection> getSectionMap() {
return sectionMap;
}
-
- @Override
- public String rawString() {
- return "<decorator-screen name=\"" + this.nameExdr.getOriginal() +
"\" location=\"" + this.locationExdr.getOriginal() + "\"/>";
- }
}
public static final class DecoratorSection extends ModelScreenWidget {
@@ -803,11 +766,6 @@ public abstract class ModelScreenWidget
public List<ModelScreenWidget> getSubWidgets() {
return subWidgets;
}
-
- @Override
- public String rawString() {
- return "<decorator-section name=\"" + getName() + "\">";
- }
}
public static final class DecoratorSectionInclude extends
ModelScreenWidget {
@@ -838,11 +796,6 @@ public abstract class ModelScreenWidget
}
}
}
-
- @Override
- public String rawString() {
- return "<decorator-section-include name=\"" + getName() + "\">";
- }
}
public static final class Label extends ModelScreenWidget {
@@ -893,11 +846,6 @@ public abstract class ModelScreenWidget
public String getStyle(Map<String, Object> context) {
return this.styleExdr.expandString(context);
}
-
- @Override
- public String rawString() {
- return "<label id=\"" + this.idExdr.getOriginal() + "\" style=\""
+ this.styleExdr.getOriginal() + "\" text=\"" + this.textExdr.getOriginal() +
"\"/>";
- }
}
public static final class Form extends ModelScreenWidget {
@@ -973,11 +921,6 @@ public abstract class ModelScreenWidget
// defaults to false, so anything but true is false
return "true".equals(shareScopeString);
}
-
- @Override
- public String rawString() {
- return "<include-form name=\"" + this.nameExdr.getOriginal() + "\"
location=\"" + this.locationExdr.getOriginal() + "\" share-scope=\"" +
this.shareScopeExdr.getOriginal() + "\"/>";
- }
}
public static final class Tree extends ModelScreenWidget {
@@ -1055,11 +998,6 @@ public abstract class ModelScreenWidget
// defaults to false, so anything but true is false
return "true".equals(shareScopeString);
}
-
- @Override
- public String rawString() {
- return "<include-tree name=\"" + this.nameExdr.getOriginal() + "\"
location=\"" + this.locationExdr.getOriginal() + "\" share-scope=\"" +
this.shareScopeExdr.getOriginal() + "\"/>";
- }
}
public static final class PlatformSpecific extends ModelScreenWidget {
@@ -1099,16 +1037,6 @@ public abstract class ModelScreenWidget
subWidget.renderWidgetString(writer, context,
screenStringRenderer);
}
}
-
- @Override
- public String rawString() {
- Collection<ModelScreenWidget> subWidgetList =
this.subWidgets.values();
- StringBuilder subWidgetsRawString = new
StringBuilder("<platform-specific>");
- for (ModelScreenWidget subWidget: subWidgetList) {
- subWidgetsRawString.append(subWidget.rawString());
- }
- return
subWidgetsRawString.append("</platform-specific>").toString();
- }
}
public static final class Content extends ModelScreenWidget {
@@ -1236,12 +1164,6 @@ public abstract class ModelScreenWidget
return this.xmlEscape;
}
- @Override
- public String rawString() {
- // may want to expand this a bit more
- return "<content content-id=\"" + this.contentId.getOriginal() +
"\" xml-escape=\"" + this.xmlEscape + "\"/>";
- }
-
public String getWidth() {
return this.width;
}
@@ -1314,12 +1236,6 @@ public abstract class ModelScreenWidget
public boolean xmlEscape() {
return this.xmlEscape;
}
-
- @Override
- public String rawString() {
- // may want to expand this a bit more
- return "<sub-content content-id=\"" + this.contentId.getOriginal()
+ "\" map-key=\"" + this.mapKey.getOriginal() + "\" xml-escape=\"" +
this.xmlEscape + "\"/>";
- }
}
public static final class Menu extends ModelScreenWidget {
@@ -1366,11 +1282,6 @@ public abstract class ModelScreenWidget
public String getLocation(Map<String, Object> context) {
return this.locationExdr.expandString(context);
}
-
- @Override
- public String rawString() {
- return "<include-menu name=\"" + this.nameExdr.getOriginal() + "\"
location=\"" + this.locationExdr.getOriginal() + "\"/>";
- }
}
public static final class Link extends ModelScreenWidget {
@@ -1544,12 +1455,6 @@ public abstract class ModelScreenWidget
return fullParameterMap;
}
-
- @Override
- public String rawString() {
- // may want to add more to this
- return "<link id=\"" + this.idExdr.getOriginal() + "\" style=\"" +
this.styleExdr.getOriginal() + "\" text=\"" + this.textExdr.getOriginal() + "\"
target=\"" + this.targetExdr.getOriginal() + "\" name=\"" +
this.nameExdr.getOriginal() + "\" url-mode=\"" + this.urlMode + "\"/>";
- }
}
public static final class Image extends ModelScreenWidget {
@@ -1626,12 +1531,6 @@ public abstract class ModelScreenWidget
public String getUrlMode() {
return this.urlMode;
}
-
- @Override
- public String rawString() {
- // may want to add more to this
- return "<image id=\"" + this.idExdr.getOriginal() + "\" style=\""
+ this.styleExdr.getOriginal() + "\" src=\"" + this.srcExdr.getOriginal() + "\"
url-mode=\"" + this.urlMode + "\"/>";
- }
}
public static final class PortalPage extends ModelScreenWidget {
@@ -1797,11 +1696,6 @@ public abstract class ModelScreenWidget
public String getUsePrivate() {
return Boolean.toString(this.usePrivate);
}
-
- @Override
- public String rawString() {
- return "<include-portal-page id=\"" + this.idExdr.getOriginal() +
"\" name=\"" + this.idExdr.getOriginal() + "\">";
- }
}
}
