Javadoc now has content.

Fixed #336 (FeatureBrowser: Javadoc tabs are empty)

svn changeset:618/svn branch:toolkit

diff --git a/src/com/itmill/toolkit/demo/features/Feature.java b/src/com/itmill/toolkit/demo/features/Feature.java
index e7d9083f12231174ae1320ea8555134c2db6e534..c59eeb30ab14f287d076f0612287a876abe75287 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/Feature.java
+++ b/src/com/itmill/toolkit/demo/features/Feature.java
@@ -44,11 +44,21 @@ public abstract class Feature extends CustomComponent {
 
        protected PropertyPanel propertyPanel;
 
+       private Label javadoc;
+
        /** Constuctor for the feature component */
        public Feature() {
                layout = new OrderedLayout(OrderedLayout.ORIENTATION_VERTICAL);
                setCompositionRoot(layout);
        }
+       
+       /**
+        * Actual URL consists of "/doc/api/com/itmill/toolkit/"+url
+        * @param url
+        */
+       public void setJavadocURL(String url) {
+               javadoc.setValue("<iframe width=\"100%\" src=\"/doc/api/com/itmill/toolkit/"+url+"\"></iframe>");
+       }
 
        /**
         * Feature component initialization is lazily done when the feature is
@@ -62,6 +72,10 @@ public abstract class Feature extends CustomComponent {
                if (initialized)
                        return;
                initialized = true;
+               
+               // Javadoc
+               javadoc = new Label();
+               javadoc.setContentMode(Label.CONTENT_RAW);
 
                // Demo
                Component demo = getDemoComponent();
@@ -71,7 +85,7 @@ public abstract class Feature extends CustomComponent {
                ts = new TabSheet();
                layout.addComponent(ts);
 
-               // Description
+               // Description tab
                String desc = getDescriptionXHTML();
                String title = getTitle();
                if (desc != null && title != null) {
@@ -84,7 +98,7 @@ public abstract class Feature extends CustomComponent {
                        ts.addTab(gl, "Description", null);
                }
 
-               // Code Sample
+               // Code Sample tab
                String example = getExampleSrc();
                if (example != null) {
                        OrderedLayout l = new OrderedLayout();
@@ -93,11 +107,9 @@ public abstract class Feature extends CustomComponent {
                        l.addComponent(new Label(example, Label.CONTENT_PREFORMATTED));
                        ts.addTab(l, "Code Sample", null);
                }
-
-               // Javadoc
-               Label javadocPlaceholder = new Label(
-                               "This is a placeholder for Javadoc");
-               ts.addTab(javadocPlaceholder, "Javadoc", null);
+               
+               // Javadoc tab
+               ts.addTab(javadoc, "Javadoc", null);
 
                // Properties tab
                // if (properties != null)

diff --git a/src/com/itmill/toolkit/demo/features/FeatureBuffering.java b/src/com/itmill/toolkit/demo/features/FeatureBuffering.java
index 3a37bc88f6e91c14d6a09d7bf2cfdda552fec196..3071c3a3d6f1a36168900c5ebf59cfec236d35fd 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureBuffering.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureBuffering.java
@@ -49,6 +49,8 @@ public class FeatureBuffering extends Feature {
                // Properties
                propertyPanel = null;
                
+               setJavadocURL("data/Buffered.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureButton.java b/src/com/itmill/toolkit/demo/features/FeatureButton.java
index 8a9e54ff619e353b9c83a83bcc88da25fcd89c7c..364e759b6ed058b6e691ae5b97382c7ee37f876e 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureButton.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureButton.java
@@ -52,6 +52,8 @@ public class FeatureButton extends Feature {
                                .createBeanPropertySet(new String[] { "switchMode" });
                propertyPanel.addProperties("Button Properties", ap);
 
+               setJavadocURL("ui/Button.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureContainers.java b/src/com/itmill/toolkit/demo/features/FeatureContainers.java
index 69950319b6749a09bc691c9e3f14ec9f98accaac..94d093ae56da1f6786daced30953b1753ba774a3 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureContainers.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureContainers.java
@@ -49,6 +49,8 @@ public class FeatureContainers extends Feature {
                // Properties
                propertyPanel = null;
                
+               setJavadocURL("data/Container.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureCustomLayout.java b/src/com/itmill/toolkit/demo/features/FeatureCustomLayout.java
index bd9b6058867fe6ad465b0b4f32cc95767d543992..a9900e4b63947a8b7c279e6babe7eed1e9805b4b 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureCustomLayout.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureCustomLayout.java
@@ -70,6 +70,8 @@ public class FeatureCustomLayout extends Feature {
 
                // Properties
                propertyPanel = null;
+               
+               setJavadocURL("ui/CustomLayout.html");
 
                return l;
        }

diff --git a/src/com/itmill/toolkit/demo/features/FeatureDateField.java b/src/com/itmill/toolkit/demo/features/FeatureDateField.java
index 314e3ae900b9c254077bbc96e4dd6792f3ff50db..30b7644857fc1e7935b32952f0146119a3f5ae32 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureDateField.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureDateField.java
@@ -92,6 +92,8 @@ public class FeatureDateField extends Feature {
                themes.addItem("calendar").getItemProperty(
                                themes.getItemCaptionPropertyId()).setValue("calendar");
                propertyPanel.addProperties("DateField Properties", ap);
+               
+               setJavadocURL("ui/DateField");
 
                return l;
        }

diff --git a/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java b/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java
index d3c5fc0bf0fb9bdf58b8aaf3d40a321036dac5d9..bb54d345ea6f31187f41d47600b8167ff2454099 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureEmbedded.java
@@ -89,6 +89,8 @@ public class FeatureEmbedded extends Feature {
                                .setDescription(
                                                "Unique object id. This can be used for example to identify windows components.");
 
+               setJavadocURL("ui/Embedded.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureForm.java b/src/com/itmill/toolkit/demo/features/FeatureForm.java
index ab3af0db5591de2dbc7b4e754f3220d8bad040b8..4e0fda7c850f8442ae9d7239b42fe5ad4c810208 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureForm.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureForm.java
@@ -52,6 +52,8 @@ public class FeatureForm extends Feature implements
                        demo = new OrderedLayout();
                        createDemo();
                }
+               
+               setJavadocURL("ui/Form.html");
 
                return demo;
        }

diff --git a/src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java b/src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java
index 493ae4ecc8e2f8e72a03eef5109baba7ba2adf62..fa60495edb17a1018c6f5a6f4452bb4aad93ea67 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureFrameWindow.java
@@ -70,6 +70,8 @@ public class FeatureFrameWindow extends Feature implements Button.ClickListener
                                "None", "Minimal" });
 
                propertyPanel.addProperties("FrameWindow Properties", ap);
+               
+               setJavadocURL("ui/FrameWindow.html");
 
                return l;
        }

diff --git a/src/com/itmill/toolkit/demo/features/FeatureGridLayout.java b/src/com/itmill/toolkit/demo/features/FeatureGridLayout.java
index 46f12821fa821790ac324a9848174cadbf9b8705..134de073f81ff4c9704b67387f897c9d4b960ca3 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureGridLayout.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureGridLayout.java
@@ -59,6 +59,8 @@ public class FeatureGridLayout extends Feature {
                propertyPanel.addProperties("GridLayout Features", ap);
                propertyPanel.getField("height").dependsOn(
                                propertyPanel.getField("add component"));
+               
+               setJavadocURL("ui/GridLayout.html");
 
                return l;
        }

diff --git a/src/com/itmill/toolkit/demo/features/FeatureItems.java b/src/com/itmill/toolkit/demo/features/FeatureItems.java
index fb9b92b24f322398465a9c85719a20bb87e8e8d9..208fccd2d97c53ac7e494dff4ef7b9e1912dd8dc 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureItems.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureItems.java
@@ -49,6 +49,8 @@ public class FeatureItems extends Feature {
                // Properties
                propertyPanel = null;
                
+               setJavadocURL("data/Items.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureLabel.java b/src/com/itmill/toolkit/demo/features/FeatureLabel.java
index 829318b57d36f6a5220a2a71e02fb1ea00c4100c..88e5448ec2a2e0905a06f6ce034992113416ef31 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureLabel.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureLabel.java
@@ -58,6 +58,8 @@ public class FeatureLabel extends Feature {
                                                "XML (Subtree with namespace)" });
                propertyPanel.addProperties("Label Properties", ap);
 
+               setJavadocURL("ui/Label.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureLink.java b/src/com/itmill/toolkit/demo/features/FeatureLink.java
index bdcd9a40e62808d3ba85bbac434848296da45d8c..b1b3a52b7a50044f2ff609b84efb6f4d3f4011f1 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureLink.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureLink.java
@@ -56,6 +56,8 @@ public class FeatureLink extends Feature {
                                "Default", "Minimal", "None" });
                propertyPanel.addProperties("Link Properties", ap);
 
+               setJavadocURL("ui/Link.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java b/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java
index 064bdaefee2ff61b6537b711374ee5cec0ed7fef..3b006e5e8682693a0ec12235a9680ac63ff4c20d 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureOrderedLayout.java
@@ -58,6 +58,8 @@ public class FeatureOrderedLayout extends Feature {
                                themes.getItemCaptionPropertyId()).setValue("form");
                propertyPanel.addProperties("OrderedLayout Properties", ap);
 
+               setJavadocURL("ui/OrderedLayout.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeaturePanel.java b/src/com/itmill/toolkit/demo/features/FeaturePanel.java
index 6379dd370d47390112d29b02ed64ca393915f7df..199203be02eb6571a55f8c56ba5450a5f507370c 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeaturePanel.java
+++ b/src/com/itmill/toolkit/demo/features/FeaturePanel.java
@@ -56,6 +56,8 @@ public class FeaturePanel extends Feature {
                                themes.getItemCaptionPropertyId()).setValue("strong");
                propertyPanel.addProperties("Panel Properties", ap);
 
+               setJavadocURL("ui/Panel.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureProperties.java b/src/com/itmill/toolkit/demo/features/FeatureProperties.java
index 22455d92dafe229498691e7f1854206149916cd1..253c20356f18929c690f53b31e345832d6630058 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureProperties.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureProperties.java
@@ -49,6 +49,8 @@ public class FeatureProperties extends Feature {
                // Properties
                propertyPanel = null;
                
+               setJavadocURL("ui/package-summary.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureSelect.java b/src/com/itmill/toolkit/demo/features/FeatureSelect.java
index aa13823be80805b71cb34fd0796ab1d51ebc2427..53d883797a72459ec5c33d0a13a98c1e1b5a6ecd 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureSelect.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureSelect.java
@@ -65,6 +65,8 @@ public class FeatureSelect extends Feature {
                                themes.getItemCaptionPropertyId()).setValue("optiongroup");
                themes.addItem("twincol").getItemProperty(
                                themes.getItemCaptionPropertyId()).setValue("twincol");
+               
+               setJavadocURL("ui/Select.html");
 
                return l;
        }

diff --git a/src/com/itmill/toolkit/demo/features/FeatureTabSheet.java b/src/com/itmill/toolkit/demo/features/FeatureTabSheet.java
index 9cc5419ce8bff89db9f897f31457f9807ca8593f..19bf0399bed3957c82878d62a69da3769e4ba56c 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureTabSheet.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureTabSheet.java
@@ -48,6 +48,8 @@ public class FeatureTabSheet extends Feature {
 
                // Properties
                propertyPanel = new PropertyPanel(ts);
+               
+               setJavadocURL("ui/TabSheet.html");
 
                return l;
        }

diff --git a/src/com/itmill/toolkit/demo/features/FeatureTable.java b/src/com/itmill/toolkit/demo/features/FeatureTable.java
index 27fcfd45b06992547b2747fcaf538129c98a6116..06c97329fa108c67dad861b4bd2a824cfb1165b1 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureTable.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureTable.java
@@ -32,6 +32,7 @@ import com.itmill.toolkit.event.Action;
 import com.itmill.toolkit.ui.Button;
 import com.itmill.toolkit.ui.Component;
 import com.itmill.toolkit.ui.Form;
+import com.itmill.toolkit.ui.Label;
 import com.itmill.toolkit.ui.OrderedLayout;
 import com.itmill.toolkit.ui.Select;
 import com.itmill.toolkit.ui.Table;
@@ -140,6 +141,8 @@ public class FeatureTable extends Feature implements Action.Handler {
                t.setColumnReorderingAllowed(true);
                t.setSelectable(true);
 
+               setJavadocURL("ui/Table.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureTextField.java b/src/com/itmill/toolkit/demo/features/FeatureTextField.java
index 4e8ded17b535ac0d1ca7fe99f947dace1153f63d..0485b9d8fa109a2d266016b08d1bc85a197690bd 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureTextField.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureTextField.java
@@ -51,7 +51,9 @@ public class FeatureTextField extends Feature {
                                "rows", "wordwrap", "writeThrough", "readThrough",
                                "nullRepresentation", "nullSettingAllowed", "secret" });
                propertyPanel.addProperties("Text field properties", f);
-
+               
+               setJavadocURL("ui/TextField.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureTree.java b/src/com/itmill/toolkit/demo/features/FeatureTree.java
index 8dff405a4bd12b93e3ede6bdc0a1e3f4820dbcff..fa82a6852b225bedcfbbab472965410c8b23dfea 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureTree.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureTree.java
@@ -118,7 +118,9 @@ public class FeatureTree extends Feature implements Action.Handler {
                themes.addItem("menu").getItemProperty(
                                themes.getItemCaptionPropertyId()).setValue("menu");
                propertyPanel.addProperties("Tree Properties", ap);
-
+               
+               setJavadocURL("ui/Tree.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureUpload.java b/src/com/itmill/toolkit/demo/features/FeatureUpload.java
index 7e391ea4ac9d531b83133f4b978efc70235797ce..e4d90ecd0130bb94ff0ec3fbbd43fd2a7d7154e3 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureUpload.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureUpload.java
@@ -65,6 +65,8 @@ public class FeatureUpload extends Feature implements Upload.FinishedListener {
 
                // Properties
                propertyPanel = new PropertyPanel(up);
+               
+               setJavadocURL("ui/Upload.html");
 
                return l;
        }

diff --git a/src/com/itmill/toolkit/demo/features/FeatureValidators.java b/src/com/itmill/toolkit/demo/features/FeatureValidators.java
index c6f70a5598449ec224553bae2379820505896003..ce469c0e9c175bcf37c0dd8862ec1e9bca8c3ce6 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureValidators.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureValidators.java
@@ -49,6 +49,8 @@ public class FeatureValidators extends Feature {
                // Properties
                propertyPanel = null;
                
+               setJavadocURL("data/Validator.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/FeatureWindow.java b/src/com/itmill/toolkit/demo/features/FeatureWindow.java
index a7e2e22381f75315d8ab717a430b056caab527e7..32fd71d5299ca590bf9b65993fdfbd992c38c5e1 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/FeatureWindow.java
+++ b/src/com/itmill/toolkit/demo/features/FeatureWindow.java
@@ -65,7 +65,9 @@ public class FeatureWindow extends Feature {
                                new Integer(Window.BORDER_MINIMAL) }, new Object[] { "Default",
                                "None", "Minimal" });
                propertyPanel.addProperties("Window Properties", windowProperties);
-
+               
+               setJavadocURL("ui/Window.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/IntroBasic.java b/src/com/itmill/toolkit/demo/features/IntroBasic.java
index 4c76a16445288ca0f5a8b6a415281f4ca1b4c63e..5501a7c96841d275b1ed59741367f4b8c40a7baa 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/IntroBasic.java
+++ b/src/com/itmill/toolkit/demo/features/IntroBasic.java
@@ -45,10 +45,12 @@ public class IntroBasic extends Feature {
                Label lab = new Label();
                lab.setStyle("featurebrowser-none");
                l.addComponent(lab);
-
+               
                // Properties
                propertyPanel = null;
 
+               setJavadocURL("ui/package-summary.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/IntroComponents.java b/src/com/itmill/toolkit/demo/features/IntroComponents.java
index b7cf2412d4157005476ab43aa79a32ed76a2aa05..966c5f818cee275a5b19fcd0c493fffc8016d9a1 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/IntroComponents.java
+++ b/src/com/itmill/toolkit/demo/features/IntroComponents.java
@@ -48,7 +48,9 @@ public class IntroComponents extends Feature {
 
                // Properties
                propertyPanel = null;
-
+               
+               setJavadocURL("ui/package-summary.html");
+               
                return l;
        }
 

diff --git a/src/com/itmill/toolkit/demo/features/IntroWelcome.java b/src/com/itmill/toolkit/demo/features/IntroWelcome.java
index 3346f97269bb26ac20084d829a67f5a77e7735e1..94277e5f58b1c4ba0add3468cda96b2ae30bd2e8 100644 (file)
--- a/src/com/itmill/toolkit/demo/features/IntroWelcome.java
+++ b/src/com/itmill/toolkit/demo/features/IntroWelcome.java
@@ -60,7 +60,9 @@ public class IntroWelcome extends Feature {
 
                // Properties
                propertyPanel = null;
-
+               
+               setJavadocURL("package-summary.html");
+       
                return l;
        }