summaryrefslogtreecommitdiffstats
path: root/src/com/itmill/toolkit/demo/sampler
diff options
context:
space:
mode:
authorMarc Englund <marc.englund@itmill.com>2008-12-11 14:40:06 +0000
committerMarc Englund <marc.englund@itmill.com>2008-12-11 14:40:06 +0000
commit136884563222e84a6c529beee9a5e81266499e77 (patch)
treec7c9bf2a6d88f70692ab4d0b6e79f51924ebc68c /src/com/itmill/toolkit/demo/sampler
parentb5f856a45dc75a52be8ba5b04af59b30774a3222 (diff)
downloadvaadin-framework-136884563222e84a6c529beee9a5e81266499e77.tar.gz
vaadin-framework-136884563222e84a6c529beee9a5e81266499e77.zip
Removed some annotations
svn changeset:6178/svn branch:trunk
Diffstat (limited to 'src/com/itmill/toolkit/demo/sampler')
-rw-r--r--src/com/itmill/toolkit/demo/sampler/SamplerApplication.java2
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java3
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java6
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java6
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java6
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java8
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java8
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java6
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java6
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java6
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java8
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java8
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java8
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java8
-rw-r--r--src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java8
15 files changed, 47 insertions, 50 deletions
diff --git a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
index c2e0c0b29b..450c279815 100644
--- a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
+++ b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
@@ -517,7 +517,7 @@ public class SamplerApplication extends Application {
}
- @Override
+
public void linkActivated(LinkActivatedEvent event) {
if (!event.isLinkOpened()) {
((SamplerWindow) getWindow()).setFeature((Feature) event
diff --git a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java b/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java
index f12dc38b78..1f1ed06bbb 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/blueprints/ProminentPrimaryAction.java
@@ -21,18 +21,15 @@ public class ProminentPrimaryAction extends Feature {
+ " - don't force it if it's not obvious.";
}
- @Override
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Button.class),
new APIResource(Link.class) };
}
- @Override
public Class[] getRelatedFeatures() {
return new Class[] { ButtonPush.class, ButtonLink.class };
}
- @Override
public NamedExternalResource[] getRelatedResources() {
return new NamedExternalResource[] {
diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java
index 44930b369d..7b62c08637 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonLink.java
@@ -16,12 +16,12 @@ public class ButtonLink extends Feature {
return "A link-styled button.";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Button.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
return new Class[] { ButtonPush.class, ButtonSwitch.class,
LinkCurrentWindow.class, LinkNoDecorations.class,
@@ -29,7 +29,7 @@ public class ButtonLink extends Feature {
FeatureSet.Links.class };
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
// TODO Auto-generated method stub
return null;
diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java
index 02c860dee8..f438f7c1da 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonPush.java
@@ -12,18 +12,18 @@ public class ButtonPush extends Feature {
return "A basic push-button.";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Button.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
return new Class[] { ButtonLink.class, ButtonSwitch.class,
ProminentPrimaryAction.class };
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
// TODO Auto-generated method stub
return null;
diff --git a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java
index bee32bf6ba..aa9163bafb 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/buttons/ButtonSwitch.java
@@ -12,18 +12,18 @@ public class ButtonSwitch extends Feature {
return "A switch button.";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Button.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
return new Class[] { ButtonPush.class, ButtonLink.class,
ProminentPrimaryAction.class };
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
// TODO Auto-generated method stub
return null;
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java b/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java
index c30fd22c57..58cb756436 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/commons/Icons.java
@@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.Component;
public class Icons extends Feature {
- @Override
+
public String getDescription() {
return "Most components can have an <i>icon</i>,"
+ " which is usually displayed next to the caption.<br/>"
@@ -16,18 +16,18 @@ public class Icons extends Feature {
+ " Beware of overuse, which will have the opposite effect.";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Component.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
// TODO Auto-generated method stub
return null;
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
// TODO Auto-generated method stub
return null;
diff --git a/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java b/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java
index 3644424ebc..0e701e6899 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/commons/Tooltips.java
@@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.AbstractComponent;
public class Tooltips extends Feature {
- @Override
+
public String getDescription() {
return "Most components can have a <i>description</i>,"
+ " which is shown as a <i>\"tooltip\"</i>.<br/>"
@@ -18,18 +18,18 @@ public class Tooltips extends Feature {
+ " for that compoenent.)";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(AbstractComponent.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
// TODO Auto-generated method stub
return null;
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
// TODO Auto-generated method stub
return null;
diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java b/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java
index 3bd09c9307..cdc9ec6023 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/link/LinkCurrentWindow.java
@@ -12,18 +12,18 @@ public class LinkCurrentWindow extends Feature {
return "An external link.";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Link.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
return new Class[] { LinkNoDecorations.class, LinkSizedWindow.class,
ButtonLink.class };
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
// TODO Auto-generated method stub
return null;
diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java b/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java
index 7d979d8b6e..12a7d3217c 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/link/LinkNoDecorations.java
@@ -12,18 +12,18 @@ public class LinkNoDecorations extends Feature {
return "A link that opens a new window w/o decorations";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Link.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
return new Class[] { LinkCurrentWindow.class, LinkSizedWindow.class,
ButtonLink.class };
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
// TODO Auto-generated method stub
return null;
diff --git a/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java b/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java
index 8591ca355b..961b4fb0e8 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/link/LinkSizedWindow.java
@@ -12,18 +12,18 @@ public class LinkSizedWindow extends Feature {
return "A link that opens a small new window w/o decorations";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Link.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
return new Class[] { LinkCurrentWindow.class, LinkNoDecorations.class,
ButtonLink.class };
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
// TODO Auto-generated method stub
return null;
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java
index f4d2afe3be..e69c6c41d9 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationCustom.java
@@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.Window;
public class NotificationCustom extends Feature {
- @Override
+
public String getDescription() {
return "Notifications are lightweight informational messages,"
+ " used to inform the user of various events.<br/>"
@@ -18,20 +18,20 @@ public class NotificationCustom extends Feature {
+ " and to the point.";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Window.class),
new APIResource(Window.Notification.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
return new Class[] { NotificationHumanized.class,
NotificationWarning.class, NotificationError.class,
NotificationTray.class };
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
return new NamedExternalResource[] { new NamedExternalResource(
"Monolog Boxes and Transparent Messages",
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java
index 2ca8e6a08a..f914e9af4e 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationError.java
@@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.Window;
public class NotificationError extends Feature {
- @Override
+
public String getDescription() {
return "Notifications are lightweight informational messages,"
+ " used to inform the user of various events. The"
@@ -22,20 +22,20 @@ public class NotificationError extends Feature {
+ " can proceed to correct the situation.";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Window.class),
new APIResource(Window.Notification.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
return new Class[] { NotificationHumanized.class,
NotificationTray.class, NotificationWarning.class,
NotificationCustom.class };
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
return null;
}
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java
index 406cb101b6..395fcce385 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationHumanized.java
@@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.Window;
public class NotificationHumanized extends Feature {
- @Override
+
public String getDescription() {
return "Notifications are lightweight informational messages,"
+ " used to inform the user of various events. The"
@@ -23,19 +23,19 @@ public class NotificationHumanized extends Feature {
+ " safely ignore, once the application is familliar.";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Window.class),
new APIResource(Window.Notification.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
return new Class[] { NotificationTray.class, NotificationWarning.class,
NotificationError.class, NotificationCustom.class };
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
return new NamedExternalResource[] { new NamedExternalResource(
"Monolog Boxes and Transparent Messages",
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java
index f55223fe9c..ea99f53bd8 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationTray.java
@@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.Window;
public class NotificationTray extends Feature {
- @Override
+
public String getDescription() {
return "Notifications are lightweight informational messages,"
+ " used to inform the user of various events. The"
@@ -23,20 +23,20 @@ public class NotificationTray extends Feature {
+ " (as opposed to being a direct result of the users last action.)";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Window.class),
new APIResource(Window.Notification.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
return new Class[] { NotificationHumanized.class,
NotificationWarning.class, NotificationError.class,
NotificationCustom.class };
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
return new NamedExternalResource[] { new NamedExternalResource(
"Monolog Boxes and Transparent Messages",
diff --git a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java
index da0f477d0d..72aa5aee3a 100644
--- a/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java
+++ b/src/com/itmill/toolkit/demo/sampler/features/notifications/NotificationWarning.java
@@ -7,7 +7,7 @@ import com.itmill.toolkit.ui.Window;
public class NotificationWarning extends Feature {
- @Override
+
public String getDescription() {
return "Notifications are lightweight informational messages,"
+ " used to inform the user of various events. The"
@@ -23,20 +23,20 @@ public class NotificationWarning extends Feature {
+ " be made aware of, but are probably intentional.";
}
- @Override
+
public APIResource[] getRelatedAPI() {
return new APIResource[] { new APIResource(Window.class),
new APIResource(Window.Notification.class) };
}
- @Override
+
public Class[] getRelatedFeatures() {
return new Class[] { NotificationHumanized.class,
NotificationTray.class, NotificationError.class,
NotificationCustom.class };
}
- @Override
+
public NamedExternalResource[] getRelatedResources() {
return new NamedExternalResource[] { new NamedExternalResource(
"Monolog Boxes and Transparent Messages",