private ParameterHandler paramHandler = new ParameterHandler() {
- public void handleParameters(Map parameters) {
+ public void handleParameters(Map<String, String[]> parameters) {
if (parameters.containsKey("username")) {
getWindow().addURIHandler(uriHandler);
- HashMap params = new HashMap();
+ HashMap<String, String> params = new HashMap<String, String>();
// expecting single params
- for (Iterator it = parameters.keySet().iterator(); it
+ for (Iterator<String> it = parameters.keySet().iterator(); it
.hasNext();) {
- String key = (String) it.next();
- String value = ((String[]) parameters.get(key))[0];
+ String key = it.next();
+ String value = (parameters.get(key))[0];
params.put(key, value);
}
LoginEvent event = new LoginEvent(params);
- for (Iterator iterator = listeners.iterator(); iterator
- .hasNext();) {
- LoginListener listener = (LoginListener) iterator
- .next();
+ for (Iterator<LoginListener> iterator = listeners
+ .iterator(); iterator.hasNext();) {
+ LoginListener listener = iterator.next();
listener.onLogin(event);
}
}
}
};
- private LinkedList listeners = new LinkedList();
+ private LinkedList<LoginListener> listeners = new LinkedList<LoginListener>();
private Window window;
*/
public class LoginEvent {
- private Map params;
+ private Map<String, String> params;
- private LoginEvent(Map params) {
+ private LoginEvent(Map<String, String> params) {
this.params = params;
}
*/
public String getLoginParameter(String name) {
if (params.containsKey(name)) {
- return (String) params.get(name);
+ return params.get(name);
} else {
return null;
}
* @version $Revision$, $Date$\r
*/\r
public class Ticket1506_TestContainer implements Container {\r
- private Map items = new HashMap();\r
+ private Map<String, PropertysetItem> items = new HashMap<String, PropertysetItem>();\r
public static final String ITEM_1_ID = "1";\r
public static final String ITEM_2_ID = "2";\r
public static final String PROPERTY_1_ID = "property 1";\r
if (items.isEmpty()) {\r
loadItems();\r
}\r
- return (Item) items.get(itemId);\r
+ return items.get(itemId);\r
}\r
\r
- public Collection getContainerPropertyIds() {\r
+ public Collection<String> getContainerPropertyIds() {\r
if (items.isEmpty()) {\r
loadItems();\r
}\r
- ArrayList a = new ArrayList();\r
+ ArrayList<String> a = new ArrayList<String>();\r
a.add(PROPERTY_1_ID);\r
a.add(PROPERTY_2_ID);\r
return a;\r
}\r
\r
- public Collection getItemIds() {\r
+ public Collection<String> getItemIds() {\r
if (items.isEmpty()) {\r
loadItems();\r
}\r
- ArrayList a = new ArrayList();\r
+ ArrayList<String> a = new ArrayList<String>();\r
a.add(ITEM_1_ID);\r
a.add(ITEM_2_ID);\r
return a;\r
if (items.isEmpty()) {\r
loadItems();\r
}\r
- Item item = (Item) items.get(itemId);\r
+ Item item = items.get(itemId);\r
if (item != null) {\r
return item.getItemProperty(propertyId);\r
}\r
return null;\r
}\r
\r
- public Class getType(Object propertyId) {\r
+ public Class<String> getType(Object propertyId) {\r
if (items.isEmpty()) {\r
loadItems();\r
}\r
* @version $Revision$, $Date$\r
*/\r
public class Ticket1506_TestContainer2 implements Container {\r
- private Map items = new HashMap();\r
+ private Map<String, PropertysetItem> items = new HashMap<String, PropertysetItem>();\r
public static final String ITEM_1_ID = "1";\r
public static final String ITEM_2_ID = "2";\r
public static final String PROPERTY_1_ID = "property 1";\r
if (items.isEmpty()) {\r
loadItems();\r
}\r
- return (Item) items.get(itemId);\r
+ return items.get(itemId);\r
}\r
\r
- public Collection getContainerPropertyIds() {\r
+ public Collection<String> getContainerPropertyIds() {\r
if (items.isEmpty()) {\r
loadItems();\r
}\r
- ArrayList a = new ArrayList();\r
+ ArrayList<String> a = new ArrayList<String>();\r
a.add(PROPERTY_1_ID);\r
a.add(PROPERTY_2_ID);\r
return a;\r
}\r
\r
- public Collection getItemIds() {\r
+ public Collection<String> getItemIds() {\r
if (items.isEmpty()) {\r
loadItems();\r
}\r
if (items.isEmpty()) {\r
loadItems();\r
}\r
- Item item = (Item) items.get(itemId);\r
+ Item item = items.get(itemId);\r
if (item != null) {\r
return item.getItemProperty(propertyId);\r
}\r
return null;\r
}\r
\r
- public Class getType(Object propertyId) {\r
+ public Class<String> getType(Object propertyId) {\r
if (items.isEmpty()) {\r
loadItems();\r
}\r
package com.vaadin.tests.tickets;\r
\r
import java.util.Iterator;\r
-import java.util.LinkedList;\r
\r
import com.vaadin.data.Property;\r
import com.vaadin.data.Property.ValueChangeEvent;\r
\r
public class Ticket1710 extends com.vaadin.Application {\r
\r
- LinkedList listOfAllFields = new LinkedList();\r
-\r
+ @Override\r
public void init() {\r
\r
setTheme("tests-tickets");\r
elp.setVisible(false);\r
el.setHeight(700);\r
addFields(el);\r
- Component firstComponent = (Component) el.getComponentIterator().next();\r
+ Component firstComponent = el.getComponentIterator().next();\r
firstComponent.setSizeFull();\r
el.expand(firstComponent);\r
lo.addComponent(elp);\r
elh.setWidth(2000);\r
elh.setHeight(100);\r
addFields(elh);\r
- Component firstComponentElh = (Component) elh.getComponentIterator()\r
- .next();\r
+ Component firstComponentElh = elh.getComponentIterator().next();\r
firstComponentElh.setSizeFull();\r
elh.expand(firstComponentElh);\r
lo.addComponent(elhp);\r
formPanel.addComponent(getFormPanelExample());\r
lo.addComponent(formPanel);\r
\r
- for (Iterator i = hidingControls.getComponentIterator(); i.hasNext();) {\r
+ for (Iterator<Component> i = hidingControls.getComponentIterator(); i\r
+ .hasNext();) {\r
((AbstractComponent) i.next()).setImmediate(true);\r
}\r
\r
testedLayout.setStyleName("tested-layout");\r
setStyleName("layout-testing-panel");\r
\r
- for (Iterator i = controls.getComponentIterator(); i.hasNext();) {\r
+ for (Iterator<Component> i = controls.getComponentIterator(); i\r
+ .hasNext();) {\r
((AbstractComponent) i.next()).setImmediate(true);\r
}\r
}\r
}\r
\r
private void updateAlignments(int h, int v) {\r
- for (Iterator i = testedLayout.getComponentIterator(); i.hasNext();) {\r
+ for (Iterator<Component> i = testedLayout.getComponentIterator(); i\r
+ .hasNext();) {\r
((Layout.AlignmentHandler) testedLayout).setComponentAlignment(\r
- (Component) i.next(), h, v);\r
+ i.next(), h, v);\r
}\r
}\r
\r
\r
public class Ticket1804 extends com.vaadin.Application {\r
\r
- LinkedList listOfAllFields = new LinkedList();\r
+ LinkedList<Select> listOfAllFields = new LinkedList<Select>();\r
\r
@Override\r
public void init() {\r
s.setComponentError(new SystemError("Test error message"));\r
listOfAllFields.add(s);\r
\r
- for (Iterator i = listOfAllFields.iterator(); i.hasNext();) {\r
- s = (Select) i.next();\r
+ for (Iterator<Select> i = listOfAllFields.iterator(); i.hasNext();) {\r
+ s = i.next();\r
main.addComponent(s);\r
s.addItem("foo");\r
s.addItem("");\r
\r
public void buttonClick(ClickEvent event) {\r
StringBuffer msg = new StringBuffer();\r
- for (java.util.Iterator i = listOfAllFields.iterator(); i\r
+ for (Iterator<Select> i = listOfAllFields.iterator(); i\r
.hasNext();) {\r
- AbstractField af = (AbstractField) i.next();\r
+ AbstractField af = i.next();\r
msg.append("<h1>" + af.getCaption() + "</h1>\n");\r
msg.append("Value=" + af.getValue() + "<br/>\n");\r
if (af.isValid()) {\r
\r
public class Ticket1811 extends com.vaadin.Application {\r
\r
- LinkedList listOfAllFields = new LinkedList();\r
+ LinkedList<TextField> listOfAllFields = new LinkedList<TextField>();\r
\r
@Override\r
public void init() {\r
tf4.addValidator(strLenValidator);\r
listOfAllFields.add(tf4);\r
\r
- for (Iterator i = listOfAllFields.iterator(); i.hasNext();) {\r
- TextField tf = (TextField) i.next();\r
+ for (Iterator<TextField> i = listOfAllFields.iterator(); i.hasNext();) {\r
+ TextField tf = i.next();\r
main.addComponent(tf);\r
tf.setImmediate(true);\r
}\r
\r
public void buttonClick(ClickEvent event) {\r
StringBuffer msg = new StringBuffer();\r
- for (java.util.Iterator i = listOfAllFields.iterator(); i\r
- .hasNext();) {\r
- TextField tf = (TextField) i.next();\r
+ for (Iterator<TextField> i = listOfAllFields\r
+ .iterator(); i.hasNext();) {\r
+ TextField tf = i.next();\r
msg.append("<h1>" + tf.getCaption() + "</h1>\n");\r
if (tf.isValid()) {\r
msg.append("VALID\n<hr/>");\r
\r
public class Ticket1819 extends com.vaadin.Application {\r
\r
- LinkedList listOfAllFields = new LinkedList();\r
+ LinkedList<Select> listOfAllFields = new LinkedList<Select>();\r
\r
@Override\r
public void init() {\r
s.setNullSelectionAllowed(false);\r
listOfAllFields.add(s);\r
\r
- for (Iterator i = listOfAllFields.iterator(); i.hasNext();) {\r
- s = (Select) i.next();\r
+ for (Iterator<Select> i = listOfAllFields.iterator(); i.hasNext();) {\r
+ s = i.next();\r
main.addComponent(s);\r
s.addItem("-null-");\r
s.addItem("");\r
\r
public void buttonClick(ClickEvent event) {\r
StringBuffer msg = new StringBuffer();\r
- for (java.util.Iterator i = listOfAllFields.iterator(); i\r
+ for (Iterator<Select> i = listOfAllFields.iterator(); i\r
.hasNext();) {\r
- AbstractField af = (AbstractField) i.next();\r
+ AbstractField af = i.next();\r
msg.append("<h1>" + af.getCaption() + "</h1>\n");\r
msg.append("Value=" + af.getValue() + "<br/>\n");\r
}\r
\r
public class Ticket1869 extends com.vaadin.Application {\r
\r
- LinkedList listOfAllFields = new LinkedList();\r
-\r
@Override\r
public void init() {\r
\r
import com.vaadin.ui.Button;\r
import com.vaadin.ui.Button.ClickEvent;\r
import com.vaadin.ui.Button.ClickListener;\r
+import com.vaadin.ui.Component;\r
import com.vaadin.ui.ExpandLayout;\r
import com.vaadin.ui.Field;\r
import com.vaadin.ui.Form;\r
Random r = new Random();\r
GridLayout l1 = new GridLayout(1, 3);\r
form = createForm(l1, "200px", "500px");\r
- BeanItem item = new BeanItem(new FormObject());\r
+ BeanItem<FormObject> item = new BeanItem<FormObject>(new FormObject());\r
form.setItemDataSource(item);\r
- for (Iterator i = item.getItemPropertyIds().iterator(); i.hasNext();) {\r
+ for (Iterator<?> i = item.getItemPropertyIds().iterator(); i.hasNext();) {\r
Object property = i.next();\r
Field f = form.getField(property);\r
\r
switchToFormsButton.setEnabled(true);\r
\r
b.setEnabled(false);\r
- java.util.Iterator i = mainLayout.getComponentIterator();\r
+ Iterator<Component> i = mainLayout.getComponentIterator();\r
i.next();\r
Layout l = (Layout) i.next();\r
\r
}
}
- public void handleParameters(Map parameters) {
- String[] s = (String[]) parameters.get("state");
+ public void handleParameters(Map<String, String[]> parameters) {
+ String[] s = parameters.get("state");
if (s == null || s.length != 1) {
return;
}
private static final int VCENTER = OrderedLayout.ALIGNMENT_VERTICAL_CENTER;\r
private static final int BOTTOM = OrderedLayout.ALIGNMENT_BOTTOM;\r
\r
- private static Map names = new HashMap();\r
+ private static Map<Integer, String> names = new HashMap<Integer, String>();\r
static {\r
names.put(new Integer(LEFT), "Left");\r
names.put(new Integer(CENTER), "Center");\r
private static final int VCENTER = OrderedLayout.ALIGNMENT_VERTICAL_CENTER;\r
private static final int BOTTOM = OrderedLayout.ALIGNMENT_BOTTOM;\r
\r
- private static Map names = new HashMap();\r
+ private static Map<Integer, String> names = new HashMap<Integer, String>();\r
static {\r
names.put(new Integer(LEFT), "Left");\r
names.put(new Integer(CENTER), "Center");\r
public void buttonClick(ClickEvent event) {
String openWindows = "";
- for (Iterator i = getWindows().iterator(); i.hasNext();) {
- Window t = (Window) i.next();
+ for (Iterator<Window> i = getWindows().iterator(); i
+ .hasNext();) {
+ Window t = i.next();
openWindows += (openWindows.length() > 0 ? "," : "")
+ t.getName();
}
public class Ticket1982 extends Application {
- private List components = new ArrayList();
+ private List<TitleBar> components = new ArrayList<TitleBar>();
@Override
public void init() {
private void restoreComponents(GridLayout gl) {
gl.removeAllComponents();
- gl.addComponent((TitleBar) components.get(0));
- gl.addComponent((TitleBar) components.get(1));
- gl.addComponent((TitleBar) components.get(2));
- gl.addComponent((TitleBar) components.get(3));
+ gl.addComponent(components.get(0));
+ gl.addComponent(components.get(1));
+ gl.addComponent(components.get(2));
+ gl.addComponent(components.get(3));
}
private class TitleBar extends ExpandLayout {
}
private void set() {
+ @SuppressWarnings("unchecked")
Set<String> values = (Set<String>) options.getValue();
TextField[] tfs = new TextField[] { tf1, tf2 };
for (TextField tf : tfs) {
ts = new TabSheet();
layout.addComponent(ts);
- for (Class c : classes) {
+ for (Class<? extends Component> c : classes) {
ts.addTab(createComponent(c), c.getSimpleName(), null);
}
rta = new RichTextArea();
c.setVisible(!c.isVisible());
}
- private Component createComponent(Class c) {
+ private Component createComponent(Class<? extends Component> c) {
RichTextArea textArea = new RichTextArea();
textArea.setVisible(false);
textArea.setCaption("This is the textArea");
Component cc = null;
try {
- cc = (Component) c.newInstance();
+ cc = c.newInstance();
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
Form f = (Form) cc;
f.setFieldFactory(new FieldFactory() {
- public Field createField(Class type, Component uiContext) {
+ public Field createField(Class<?> type, Component uiContext) {
return createField();
}
}
});
- f.setItemDataSource(new BeanItem(new Object() {
+ f.setItemDataSource(new BeanItem<Object>(new Object() {
private int a;
public int getA() {
gl.newLine();
form = new Form(gl);
- form.setItemDataSource(new BeanItem(new MyBean()));
+ form.setItemDataSource(new BeanItem<MyBean>(new MyBean()));
gl.addComponent(new Label("After form"));
w.addComponent(new Button("new item", new Button.ClickListener() {
public void buttonClick(ClickEvent event) {
- form.setItemDataSource(new BeanItem(new MyBean()));
+ form.setItemDataSource(new BeanItem<MyBean>(new MyBean()));
}
new Button.ClickListener() {
public void buttonClick(ClickEvent event) {
- form.setItemDataSource(new BeanItem(new MyBiggerBean()));
+ form.setItemDataSource(new BeanItem<MyBean>(
+ new MyBiggerBean()));
}
}\r
\r
void clearSelection2() {\r
- table.setValue(new HashSet());\r
+ table.setValue(new HashSet<Object>());\r
}\r
\r
void clearSelection3() {\r
\r
void printSelection() {\r
String selection = "";\r
- for (Object item : (Collection) table.getValue()) {\r
+ for (Object item : (Collection<?>) table.getValue()) {\r
selection = selection + item + ' ';\r
}\r
result.setValue(selection);\r
}\r
\r
});\r
- form.setItemDataSource(new BeanItem(new MyBean()));\r
+ form.setItemDataSource(new BeanItem<MyBean>(new MyBean()));\r
root.addComponent(form);\r
\r
table = new Table("Enabled");\r
// Create form for editing address
final Form f = new Form();
- f.setItemDataSource(new BeanItem(address, new String[] { "name",
- "street", "zip", "city", "state", "country" }));
+ f.setItemDataSource(new BeanItem<Address>(address, new String[] {
+ "name", "street", "zip", "city", "state", "country" }));
f.setCaption("Office address");
f.setIcon(new ThemeResource("../runo/icons/16/document.png"));
f.setDescription("Jep jpe, this is form description.");