[console] removed onInitialize for extension

lambdadaku · Apr 15, 2011 · ee55b68 · ee55b68
1 parent 70b1065
commit ee55b68
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 106 deletions.
diff --git a/...es/src/main/java/org/wicketstuff/console/examples/ClojureEngineWithTemplatesTestPage.java b/...es/src/main/java/org/wicketstuff/console/examples/ClojureEngineWithTemplatesTestPage.java
@@ -29,7 +29,8 @@ public ClojureEngineWithTemplatesTestPage(final PageParameters params) {
         super(params);
         add(new Label("title", new ResourceModel("application.title")));
 
-        add(new ClojureScriptEngineWithTemplatesPanel("panel", null, null));
+        final ClojureScriptEngineWithTemplatesPanel panel = new ClojureScriptEngineWithTemplatesPanel("panel", null, null);
+        add(panel);
 
         add(new TestPageLinksPanel("links"));
     }

diff --git a/...arent/console-parent/console/src/main/java/org/wicketstuff/console/ScriptEnginePanel.java b/...arent/console-parent/console/src/main/java/org/wicketstuff/console/ScriptEnginePanel.java
@@ -75,7 +75,6 @@ protected void onInitialize() {
             super.onInitialize();
             add(new AttributeAppender("onclick", Model.of("clearTextarea('"
                     + inputTf.getMarkupId() + "')"), ";"));
-
         }
 
     }

diff --git a/...-parent/console/src/main/java/org/wicketstuff/console/ScriptEnginePanelWithTemplates.java b/...-parent/console/src/main/java/org/wicketstuff/console/ScriptEnginePanelWithTemplates.java
@@ -33,93 +33,87 @@
  */
 public class ScriptEnginePanelWithTemplates extends Panel {
 
-	private static final long serialVersionUID = 1L;
-	private final Lang lang;
-	private ScriptEnginePanel enginePanel;
-	private ScriptTemplateSelectionTablePanel selectionTable;
-	private IDataProvider<ScriptTemplate> dataProvider;
-	private final IModel<String> title;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param id
-	 *            id
-	 * @param lang
-	 *            source language
-	 * @param title
-	 *            title, may be {@code null} for default
-	 * @param dataProvider
-	 *            data provider for script templates, may be {@code null} for
-	 *            default
-	 */
-	public ScriptEnginePanelWithTemplates(final String id, final Lang lang,
-			final IModel<String> title,
-			final IDataProvider<ScriptTemplate> dataProvider) {
-		super(id);
-
-		this.lang = lang;
-		this.title = title;
-		this.dataProvider = dataProvider;
-
-		if (dataProvider == null) {
-			this.dataProvider = packagedScriptTemplatesDataProvider(lang);
-		}
-
-	}
-
-	/**
-	 * Creates a data provider that returns all packaged templates for a given
-	 * source language.
-	 * 
-	 * @param lang
-	 *            language
-	 * @return data provider
-	 * @see PackagedScriptTemplates#getPackagedScriptTemplates(Lang)
-	 */
-	public static IDataProvider<ScriptTemplate> packagedScriptTemplatesDataProvider(
-			final Lang lang) {
-		return new ListDataProvider<ScriptTemplate>(
-				PackagedScriptTemplates.getPackagedScriptTemplates(lang));
-	}
-
-	@Override
-	protected void onInitialize() {
-		super.onInitialize();
-
-		enginePanel = newEnginePanel();
-		enginePanel.setOutputMarkupId(true);
-		add(enginePanel);
-
-		selectionTable = newSelectionTable("selectionPanel", enginePanel,
-				dataProvider);
-		add(selectionTable);
-	}
-
-	/**
-	 * Create the engine panel, override to customize.
-	 */
-	protected ScriptEnginePanel newEnginePanel() {
-		return ScriptEnginePanel.create("enginePanel", lang, title);
-	}
-
-	/**
-	 * Create the selection table, override to customize.
-	 */
-	protected ScriptTemplateSelectionTablePanel newSelectionTable(
-			final String wicketId, final ScriptEnginePanel enginePanel,
-			final IDataProvider<ScriptTemplate> dataProvider) {
-
-		return new ScriptTemplateSelectionTablePanel(wicketId, enginePanel,
-				dataProvider, 100);
-	}
-
-	public ScriptEnginePanel getEnginePanel() {
-		return enginePanel;
-	}
-
-	public ScriptTemplateSelectionTablePanel getSelectionTable() {
-		return selectionTable;
-	}
+    private static final long serialVersionUID = 1L;
+    private final Lang lang;
+    private final ScriptEnginePanel enginePanel;
+    private final ScriptTemplateSelectionTablePanel selectionTable;
+    private IDataProvider<ScriptTemplate> dataProvider;
+    private final IModel<String> title;
+
+    /**
+     * Constructor.
+     * 
+     * @param id
+     *            id
+     * @param lang
+     *            source language
+     * @param title
+     *            title, may be {@code null} for default
+     * @param dataProvider
+     *            data provider for script templates, may be {@code null} for
+     *            default
+     */
+    public ScriptEnginePanelWithTemplates(final String id, final Lang lang,
+            final IModel<String> title,
+            final IDataProvider<ScriptTemplate> dataProvider) {
+        super(id);
+
+        this.lang = lang;
+        this.title = title;
+        this.dataProvider = dataProvider;
+
+        if (dataProvider == null) {
+            this.dataProvider = packagedScriptTemplatesDataProvider(lang);
+        }
+
+        enginePanel = newEnginePanel();
+        enginePanel.setOutputMarkupId(true);
+        add(enginePanel);
+
+        selectionTable = newSelectionTable("selectionPanel", enginePanel,
+                this.dataProvider);
+        add(selectionTable);
+
+    }
+
+    private IDataProvider<ScriptTemplate> packagedScriptTemplatesDataProvider(
+            final Lang lang) {
+        return new ListDataProvider<ScriptTemplate>(
+                PackagedScriptTemplates.getPackagedScriptTemplates(lang));
+    }
+
+    /**
+     * Create the engine panel, override to customize.
+     * <p>
+     * Attention: This is called from the constructor.
+     */
+    protected ScriptEnginePanel newEnginePanel() {
+        return ScriptEnginePanel.create("enginePanel", lang, title);
+    }
+
+    /**
+     * Create the selection table, override to customize.
+     * <p>
+     * Attention: This is called from the constructor.
+     */
+    protected ScriptTemplateSelectionTablePanel newSelectionTable(
+            final String wicketId, final ScriptEnginePanel enginePanel,
+            final IDataProvider<ScriptTemplate> dataProvider) {
+
+        return new ScriptTemplateSelectionTablePanel(wicketId, enginePanel,
+                dataProvider, 100);
+    }
+
+    public ScriptEnginePanel getEnginePanel() {
+        return enginePanel;
+    }
+
+    public ScriptTemplateSelectionTablePanel getSelectionTable() {
+        return selectionTable;
+    }
+
+    public IDataProvider<ScriptTemplate> getDataProvider() {
+        return dataProvider;
+    }
 
 }
diff --git a/...rent/console-parent/console/src/main/java/org/wicketstuff/console/ScriptEngineWindow.java b/...rent/console-parent/console/src/main/java/org/wicketstuff/console/ScriptEngineWindow.java
@@ -32,7 +32,7 @@ public abstract class ScriptEngineWindow extends ModalWindow {
 
     private static final long serialVersionUID = 1L;
     private final Lang lang;
-    private ScriptEnginePanel enginePanel;
+    private final ScriptEnginePanel enginePanel;
 
     /**
      * Constructor.
@@ -53,18 +53,15 @@ public ScriptEngineWindow(final String id, final Lang lang,
         setAutoSize(true);
         setResizable(false);
 
-    }
-
-    @Override
-    protected void onInitialize() {
-        super.onInitialize();
-
         enginePanel = newEnginePanel(getContentId(), lang);
         setContent(enginePanel);
+
     }
 
     /**
      * Creates a new engine panel, override to customize.
+     * <p>
+     * Attention: This is called from the constructor.
      * 
      * @param wicketId
      *            id

diff --git a/...parent/console/src/main/java/org/wicketstuff/console/ScriptEngineWithTemplatesWindow.java b/...parent/console/src/main/java/org/wicketstuff/console/ScriptEngineWithTemplatesWindow.java
@@ -32,8 +32,7 @@
 public abstract class ScriptEngineWithTemplatesWindow extends ModalWindow {
 
     private static final long serialVersionUID = 1L;
-    private final Lang lang;
-    private ScriptEnginePanelWithTemplates enginePanelWithTemplates;
+    private final ScriptEnginePanelWithTemplates enginePanelWithTemplates;
     private final IDataProvider<ScriptTemplate> dataProvider;
 
     /**
@@ -53,26 +52,22 @@ public ScriptEngineWithTemplatesWindow(final String id, final Lang lang,
             final IModel<String> windowTitle,
             final IDataProvider<ScriptTemplate> dataProvider) {
         super(id);
-        this.lang = lang;
         this.dataProvider = dataProvider;
 
         setTitle(windowTitle != null ? windowTitle : Model.of("Wicket Console"));
         setAutoSize(true);
         setResizable(false);
 
-    }
-
-    @Override
-    protected void onInitialize() {
-        super.onInitialize();
-
         enginePanelWithTemplates = newEnginePanelWithTemplates(getContentId(),
                 lang);
         setContent(enginePanelWithTemplates);
+
     }
 
     /**
      * Creates a new engine panel with templates, override to customize.
+     * <p>
+     * Attention: This is called from the constructor.
      * 
      * @param wicketId
      *            id