Browse Source

Merge pull request #78 in BA/design from ~NEIL/design:release to release

* commit 'fe42842a54f30ae533289cb5ee88f724d37906a6':
  1
  1
  冲突
master
superman 9 years ago
parent
commit
aaa9350a4a
  1. 45
      designer_base/src/com/fr/design/ExtraDesignClassManager.java

45
designer_base/src/com/fr/design/ExtraDesignClassManager.java

@ -130,9 +130,17 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
private Set<ElementUIProvider> elementUIProviders; private Set<ElementUIProvider> elementUIProviders;
private Set<WidgetPropertyUIProvider> widgetAttrProviders; private Set<WidgetAttrProvider> widgetAttrProviders;
private Set<ExportAttrTabProvider> exportAttrTabProviders; private WidgetDesignHandler widgetDesignHandler;
public WidgetDesignHandler getWidgetDesignHandler() {
return widgetDesignHandler;
}
public void setWidgetDesignHandler(Level level, PluginSimplify simplify) throws Exception {
widgetDesignHandler = (WidgetDesignHandler) level;
}
public TableDataTreePaneProcessor getTableDataTreePaneProcessor() { public TableDataTreePaneProcessor getTableDataTreePaneProcessor() {
return tableDataTreePaneProcessor; return tableDataTreePaneProcessor;
@ -740,34 +748,19 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
elementUIProviders.add((ElementUIProvider) level); elementUIProviders.add((ElementUIProvider) level);
} }
public WidgetPropertyUIProvider[] getWidgetAttrProviders() { public WidgetAttrProvider[] getWidgetAttrProviders() {
if (widgetAttrProviders == null) { if (widgetAttrProviders == null) {
return new WidgetPropertyUIProvider[0]; return new WidgetAttrProvider[0];
} }
return widgetAttrProviders.toArray(new WidgetPropertyUIProvider[widgetAttrProviders.size()]); return widgetAttrProviders.toArray(new WidgetAttrProvider[widgetAttrProviders.size()]);
} }
public void addWidgetAttrProvider(Level level, PluginSimplify simplify) throws Exception { public void addWidgetAttrProvider(Level level, PluginSimplify simplify) throws Exception {
if (widgetAttrProviders == null) { if (widgetAttrProviders == null) {
widgetAttrProviders = new HashSet<WidgetPropertyUIProvider>(); widgetAttrProviders = new HashSet<WidgetAttrProvider>();
}
validAPILevel(level, WidgetPropertyUIProvider.CURRENT_LEVEL, simplify.getPluginName());
widgetAttrProviders.add((WidgetPropertyUIProvider) level);
}
public ExportAttrTabProvider[] getExportAttrTabProviders() {
if (exportAttrTabProviders == null) {
return new ExportAttrTabProvider[0];
}
return exportAttrTabProviders.toArray(new ExportAttrTabProvider[exportAttrTabProviders.size()]);
}
public void addExportAttrTabProvider(Level level, PluginSimplify simplify) throws Exception {
if (exportAttrTabProviders == null) {
exportAttrTabProviders = new HashSet<ExportAttrTabProvider>();
} }
validAPILevel(level, ExportAttrTabProvider.CURRENT_LEVEL, simplify.getPluginName()); validAPILevel(level, WidgetAttrProvider.CURRENT_LEVEL, simplify.getPluginName());
exportAttrTabProviders.add((ExportAttrTabProvider) level); widgetAttrProviders.add((WidgetAttrProvider) level);
} }
/** /**
@ -862,10 +855,10 @@ public class ExtraDesignClassManager extends XMLFileManager implements ExtraDesi
setTableDataSourceOPProcessor(impl, simplify); setTableDataSourceOPProcessor(impl, simplify);
} else if (tagName.equals(ElementUIProvider.MARK_STRING)) { } else if (tagName.equals(ElementUIProvider.MARK_STRING)) {
addElementUIProvider(impl, simplify); addElementUIProvider(impl, simplify);
} else if (tagName.equals(WidgetPropertyUIProvider.XML_TAG)) { } else if (tagName.equals(WidgetAttrProvider.XML_TAG)) {
addWidgetAttrProvider(impl, simplify); addWidgetAttrProvider(impl, simplify);
} else if (tagName.equals(ExportAttrTabProvider.XML_TAG)) { } else if (tagName.equals(WidgetDesignHandler.XML_TAG)) {
addExportAttrTabProvider(impl, simplify); setWidgetDesignHandler(impl, simplify);
} }
} catch (PluginInvalidLevelException e) { } catch (PluginInvalidLevelException e) {
PluginMessage.remindUpdate(e.getMessage()); PluginMessage.remindUpdate(e.getMessage());

Loading…
Cancel
Save