Przeglądaj źródła

Fix some generics warnings in Eclipse

tags/8.1.0.alpha1
Ahmed Ashour 7 lat temu
rodzic
commit
1290426ff3

+ 3
- 3
compatibility-server/src/main/java/com/vaadin/v7/data/util/converter/StringToCollectionConverter.java Wyświetl plik

@@ -210,9 +210,9 @@ public class StringToCollectionConverter
public Collection<?> createCollection(
Class<? extends Collection> type) {
if (type.isAssignableFrom(ArrayList.class)) {
return new ArrayList();
return new ArrayList<Object>();
} else if (type.isAssignableFrom(HashSet.class)) {
return new HashSet();
return new HashSet<Object>();
} else if (!type.isInterface()
&& !Modifier.isAbstract(type.getModifiers())) {
try {
@@ -221,7 +221,7 @@ public class StringToCollectionConverter
} catch (IllegalAccessException ignore) {
}
}
return new ArrayList();
return new ArrayList<Object>();
}

}

+ 4
- 3
uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java Wyświetl plik

@@ -20,6 +20,7 @@ import java.time.LocalDate;
import java.util.Random;

import com.vaadin.server.ExternalResource;
import com.vaadin.shared.ui.datefield.DateResolution;
import com.vaadin.tests.components.TestDateField;
import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.AbstractDateField;
@@ -184,14 +185,14 @@ public class RandomLayoutStress extends com.vaadin.server.LegacyApplication {
case 6:
// Datefield
result = new TestDateField();
((AbstractDateField) result).setStyleName("calendar");
((AbstractDateField) result).setValue(LocalDate.now());
((AbstractDateField<LocalDate, DateResolution>) result).setStyleName("calendar");
((AbstractDateField<LocalDate, DateResolution>) result).setValue(LocalDate.now());
result.setCaption("Calendar component " + caption);
break;
case 7:
// Datefield
result = new TestDateField();
((AbstractDateField) result).setValue(LocalDate.now());
((AbstractDateField<LocalDate, DateResolution>) result).setValue(LocalDate.now());
result.setCaption("Calendar component " + caption);
break;
}

+ 1
- 1
uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java Wyświetl plik

@@ -120,7 +120,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
test(layout, button);
button.addListener(this);

final AbstractDateField df = new TestDateField("DateField " + count++);
final AbstractDateField<?, ?> df = new TestDateField("DateField " + count++);
test(layout, df);

final CheckBox cb = new CheckBox("Checkbox " + count++);

+ 5
- 5
uitest/src/main/java/com/vaadin/tests/TestDateField.java Wyświetl plik

@@ -34,7 +34,7 @@ public class TestDateField extends CustomComponent {

VerticalLayout main = new VerticalLayout();

AbstractDateField df;
AbstractDateField<?, ?> df;

public TestDateField() {
setCompositionRoot(main);
@@ -57,22 +57,22 @@ public class TestDateField extends CustomComponent {
df.addStyleName("thisShouldBeHarmless");

// Another test: locale
final AbstractDateField df1 = new com.vaadin.tests.components.TestDateField(
final AbstractDateField<?, ?> df1 = new com.vaadin.tests.components.TestDateField(
"US locale");
main.addComponent(df1);
df1.setLocale(new Locale("en", "US"));

final AbstractDateField df2 = new com.vaadin.tests.components.TestDateField(
final AbstractDateField<?, ?> df2 = new com.vaadin.tests.components.TestDateField(
"DE locale");
main.addComponent(df2);
df2.setLocale(new Locale("de", "DE"));

final AbstractDateField df3 = new com.vaadin.tests.components.TestDateField(
final AbstractDateField<?, ?> df3 = new com.vaadin.tests.components.TestDateField(
"RU locale");
main.addComponent(df3);
df3.setLocale(new Locale("ru", "RU"));

final AbstractDateField df4 = new com.vaadin.tests.components.TestDateField(
final AbstractDateField<?, ?> df4 = new com.vaadin.tests.components.TestDateField(
"FI locale");
main.addComponent(df4);
df4.setLocale(new Locale("fi", "FI"));

+ 2
- 2
uitest/src/main/java/com/vaadin/tests/TestForAlignments.java Wyświetl plik

@@ -37,8 +37,8 @@ public class TestForAlignments extends CustomComponent {
final Button b4 = new Button("Top");
final TextField t1 = new TextField("Right aligned");
final TextField t2 = new TextField("Bottom aligned");
final AbstractDateField d1 = new TestDateField("Center aligned");
final AbstractDateField d2 = new TestDateField("Center aligned");
final AbstractDateField<?, ?> d1 = new TestDateField("Center aligned");
final AbstractDateField<?, ?> d2 = new TestDateField("Center aligned");

final VerticalLayout vert = new VerticalLayout();
vert.addComponent(b1);

+ 2
- 1
uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java Wyświetl plik

@@ -16,6 +16,7 @@

package com.vaadin.tests;

import java.time.LocalDate;
import java.util.Locale;

import com.vaadin.server.Sizeable;
@@ -82,7 +83,7 @@ public class TestForBasicApplicationLayout extends CustomComponent {
controls.addComponent(click);
controls.addComponent(click2);
reportLayout.addComponent(controls);
final AbstractDateField cal = new TestDateField();
final AbstractDateField<LocalDate, DateResolution> cal = new TestDateField();
cal.setResolution(DateResolution.DAY);
cal.setLocale(new Locale("en", "US"));
reportLayout.addComponent(cal);

+ 1
- 1
uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java Wyświetl plik

@@ -48,7 +48,7 @@ public class FocusAndBlurListeners extends TestBase {
TextField tf = new TextField("TextField");
l.addComponent(tf);

AbstractDateField df = new TestDateField("DateField");
AbstractDateField<?, ?> df = new TestDateField("DateField");
l.addComponent(df);

ComboBox cb = new ComboBox("ComboBox");

+ 1
- 1
uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java Wyświetl plik

@@ -95,7 +95,7 @@ public abstract class AbstractComponentDataBindingTest extends TestBase

@Override
public void valueChange(ValueChangeEvent event) {
AbstractField field = (AbstractField) event.getProperty();
AbstractField<?> field = (AbstractField<?>) event.getProperty();
// if (field == localeSelect) {
// return;
// }

+ 1
- 1
uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java Wyświetl plik

@@ -39,7 +39,7 @@ public class LayoutAfterHidingError extends AbstractReindeerTestUI {
gl.setWidth("100%");
panel.setContent(gl);

final AbstractDateField df = new TestDateField();
final AbstractDateField<?, ?> df = new TestDateField();
df.setWidth("100%");
gl.addComponent(df);


+ 1
- 1
uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java Wyświetl plik

@@ -152,7 +152,7 @@ public class TableChildMeasurementHint extends AbstractReindeerTestUI {
table.addGeneratedColumn("First_Name" + 4, new Table.ColumnGenerator() {
@Override
public Object generateCell(Table components, Object o, Object o2) {
AbstractDateField b = new TestDateField("DateField");
AbstractDateField<?, ?> b = new TestDateField("DateField");
b.setWidthUndefined();
return b;
}

+ 3
- 2
uitest/src/main/java/com/vaadin/tests/components/uitest/components/DatesCssTest.java Wyświetl plik

@@ -2,6 +2,7 @@ package com.vaadin.tests.components.uitest.components;

import java.time.LocalDate;

import com.vaadin.shared.ui.datefield.DateResolution;
import com.vaadin.tests.components.TestDateField;
import com.vaadin.tests.components.uitest.TestSampler;
import com.vaadin.ui.AbstractDateField;
@@ -28,7 +29,7 @@ public class DatesCssTest extends GridLayout {
createDateFieldWith("Small", ChameleonTheme.DATEFIELD_SMALL, null);
createDateFieldWith("Big", ChameleonTheme.DATEFIELD_BIG, null);

AbstractDateField df = new DateField("Popup date field");
AbstractDateField<LocalDate, DateResolution> df = new DateField("Popup date field");
df.setId("datefield" + debugIdCounter++);
df.setValue(date);
addComponent(df);
@@ -47,7 +48,7 @@ public class DatesCssTest extends GridLayout {

private void createDateFieldWith(String caption, String primaryStyleName,
String width) {
AbstractDateField df = new TestDateField("Date field");
AbstractDateField<LocalDate, DateResolution> df = new TestDateField("Date field");
df.setId("datefield" + debugIdCounter++);
df.setValue(date);


+ 3
- 3
uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java Wyświetl plik

@@ -51,7 +51,7 @@ public class DateFields extends VerticalLayout implements View {
row.addStyleName(ValoTheme.LAYOUT_HORIZONTAL_WRAPPING);
addComponent(row);

AbstractDateField date = new TestDateField("Default resolution");
AbstractDateField<LocalDate, DateResolution> date = new TestDateField("Default resolution");
setDate(date);
row.addComponent(date);

@@ -188,14 +188,14 @@ public class DateFields extends VerticalLayout implements View {
row.addComponent(form);
}

private void setDateRange(AbstractDateField date) {
private void setDateRange(AbstractDateField<LocalDate, DateResolution> date) {
date.setRangeStart(getDefaultDate());

LocalDate endDate = getDefaultDate();
date.setRangeEnd(endDate.plusMonths(1));
}

private void setDate(AbstractDateField date) {
private void setDate(AbstractDateField<LocalDate, DateResolution> date) {
date.setValue(getDefaultDate());
}


+ 2
- 1
uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java Wyświetl plik

@@ -21,6 +21,7 @@ import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
import com.vaadin.server.UserError;
import com.vaadin.shared.ui.MarginInfo;
import com.vaadin.shared.ui.datefield.DateResolution;
import com.vaadin.tests.components.TestDateField;
import com.vaadin.ui.AbstractDateField;
import com.vaadin.ui.Alignment;
@@ -73,7 +74,7 @@ public class Forms extends VerticalLayout implements View {
name.setWidth("50%");
form.addComponent(name);

AbstractDateField birthday = new TestDateField("Birthday");
AbstractDateField<LocalDate, DateResolution> birthday = new TestDateField("Birthday");
birthday.setValue(LocalDate.of(1980, 1, 31));
form.addComponent(birthday);


+ 1
- 1
uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java Wyświetl plik

@@ -199,7 +199,7 @@ public class Tables extends VerticalLayout implements View {
@Override
public Object generateCell(Table source, Object itemId,
Object columnId) {
AbstractDateField tf = new TestDateField();
AbstractDateField<?, ?> tf = new TestDateField();
tf.addStyleName(ValoTheme.TABLE_COMPACT);
if ((Integer) itemId % 2 == 0) {
tf.addStyleName(ValoTheme.DATEFIELD_BORDERLESS);

Ładowanie…
Anuluj
Zapisz