Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

# 11 - [WARNING] /path/to/SomeType.java found raw type: org.gwtproject.editor.client.adapters.SimpleEditor missing type arguments... - fixed #24

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

# 11 - [WARNING] /path/to/SomeType.java found raw type: org.gwtproject.editor.client.adapters.SimpleEditor missing type arguments... - fixed #24

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
636f4f0
done
FrankHossfeld Mar 30, 2023
883cf96
#11 - [WARNING] /path/to/SomeType.java found raw type: org.gwtproject…
FrankHossfeld Mar 30, 2023
50546e0
Merge remote-tracking branch 'origin/issue/11' into issue/11
FrankHossfeld Mar 30, 2023
7aabe64
improve error message in case a getter is not found
FrankHossfeld Mar 13, 2024
a2fe7ca
udpate versions
FrankHossfeld Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gwt-editor-gwt2-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<properties>
<maven.gwt.plugin>1.0.0</maven.gwt.plugin>

<gwt.version>2.9.0</gwt.version>
<gwt.version>2.10.0</gwt.version>
<junit.version>4.13.1</junit.version>
</properties>

Expand Down
199 changes: 152 additions & 47 deletions gwt-editor-processor/src/main/java/org/gwtproject/editor/processor/DriverProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,30 @@
import com.google.auto.common.MoreTypes;
import com.google.auto.service.AutoService;
import com.google.common.base.Stopwatch;
import com.squareup.javapoet.*;
import com.squareup.javapoet.AnnotationSpec;
import com.squareup.javapoet.ClassName;
import com.squareup.javapoet.FieldSpec;
import com.squareup.javapoet.JavaFile;
import com.squareup.javapoet.MethodSpec;
import com.squareup.javapoet.ParameterizedTypeName;
import com.squareup.javapoet.TypeName;
import com.squareup.javapoet.TypeSpec;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.*;
import java.util.ArrayList;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.StringJoiner;
import java.util.stream.Stream;
import javax.annotation.processing.*;
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.Filer;
import javax.annotation.processing.Messager;
import javax.annotation.processing.ProcessingEnvironment;
import javax.annotation.processing.Processor;
import javax.annotation.processing.RoundEnvironment;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.Modifier;
Expand Down Expand Up @@ -164,6 +181,10 @@ protected void generate(TypeElement interfaceToImplement, EditorModel rootEditor
.addModifiers(Modifier.PUBLIC)
.returns(void.class)
.addAnnotation(Override.class)
.addAnnotation(
AnnotationSpec.builder(SuppressWarnings.class)
.addMember("value", "$S", "unchecked")
.build())
.addParameter(EditorVisitor.class, "visitor")
// ugly cast to shut up java warnings at compile time - however, this might be overkill,
// could just use raw types
Expand Down Expand Up @@ -240,6 +261,10 @@ protected void generate(TypeElement interfaceToImplement, EditorModel rootEditor
/**
* Joins the name of the type with any enclosing types, with "_" as the delimeter, and appends an
* optional suffix.
*
* @param interfaceToImplement TypeElement of the interface to implement
* @param suffix suffix to use or null (no suffix)
* @return created name
*/
protected String createNameFromEnclosedTypes(TypeElement interfaceToImplement, String suffix) {
StringJoiner joiner = new StringJoiner("_", "", suffix == null ? "" : suffix);
Expand Down Expand Up @@ -272,22 +297,38 @@ protected ClassName getEditorDelegate(EditorModel editorModel, EditorProperty da
TypeSpec.classBuilder(delegateSimpleName)
.addOriginatingElement(types.asElement(data.getEditedType()))
.addOriginatingElement(types.asElement(data.getEditorType()))
.addModifiers(Modifier.PUBLIC)
// Once GWT supports the new package of the Generated class
// we can uncomment this code
// .addAnnotation(
// AnnotationSpec.builder(getGeneratedClassName())
// .addMember("value", "\"$L\"",
// DriverProcessor.class.getCanonicalName())
// .build())
.superclass(getEditorDelegateType()); // raw type here, for the same reason as above
.addModifiers(Modifier.PUBLIC);
// Once GWT supports the new package of the Generated class
// we can uncomment this code
// .addAnnotation(
// AnnotationSpec.builder(getGeneratedClassName())
// .addMember("value", "\"$L\"",
// DriverProcessor.class.getCanonicalName())
// .build())
if (data.getEditedType() != null && data.getEditorType() != null) {
ParameterizedTypeName delegateType =
ParameterizedTypeName.get(
getEditorDelegateType(),
TypeName.get(data.getEditedType()),
TypeName.get(data.getEditorType()));
delegateTypeBuilder.superclass(delegateType);
} else {
delegateTypeBuilder.superclass(getEditorDelegateType());
}

NameFactory names = new NameFactory();
Map<EditorProperty, String> delegateFields = new IdentityHashMap<>();

delegateTypeBuilder.addField(
FieldSpec.builder(rawEditorType, "editor", Modifier.PRIVATE).build());
names.addName("editor");
if (data.getEditorType() != null) {
delegateTypeBuilder.addField(
FieldSpec.builder(ClassName.get(data.getEditorType()), "editor", Modifier.PRIVATE)
.build());
names.addName("editor");
} else {
delegateTypeBuilder.addField(
FieldSpec.builder(rawEditorType, "editor", Modifier.PRIVATE).build());
names.addName("editor");
}
delegateTypeBuilder.addField(
FieldSpec.builder(ClassName.get(data.getEditedType()), "object", Modifier.PRIVATE).build());
names.addName("object");
Expand All @@ -298,26 +339,48 @@ protected ClassName getEditorDelegate(EditorModel editorModel, EditorProperty da
String fieldName = names.createName(d.getPropertyName() + "Delegate");
delegateFields.put(d, fieldName);
delegateTypeBuilder.addField(
getEditorDelegateType(), fieldName, Modifier.PRIVATE); // TODO parameterize
ParameterizedTypeName.get(
getEditorDelegateType(),
TypeName.get(d.getEditedType()),
TypeName.get(d.getEditorType())),
fieldName,
Modifier.PRIVATE);
}
}

delegateTypeBuilder.addMethod(
MethodSpec.methodBuilder("getEditor")
.addModifiers(Modifier.PROTECTED)
.returns(rawEditorType)
.addAnnotation(Override.class)
.addStatement("return editor")
.build());

delegateTypeBuilder.addMethod(
MethodSpec.methodBuilder("setEditor")
.addModifiers(Modifier.PROTECTED)
.returns(void.class)
.addAnnotation(Override.class)
.addParameter(Editor.class, "editor")
.addStatement("this.editor = ($T) editor", rawEditorType)
.build());
if (data.getEditorType() != null) {
delegateTypeBuilder.addMethod(
MethodSpec.methodBuilder("getEditor")
.addModifiers(Modifier.PROTECTED)
.returns(ClassName.get(data.getEditorType()))
.addAnnotation(Override.class)
.addStatement("return editor")
.build());
delegateTypeBuilder.addMethod(
MethodSpec.methodBuilder("setEditor")
.addModifiers(Modifier.PROTECTED)
.returns(void.class)
.addAnnotation(Override.class)
.addParameter(ClassName.get(data.getEditorType()), "editor")
.addStatement("this.editor = editor")
.build());
} else {
delegateTypeBuilder.addMethod(
MethodSpec.methodBuilder("getEditor")
.addModifiers(Modifier.PROTECTED)
.returns(rawEditorType)
.addAnnotation(Override.class)
.addStatement("return editor")
.build());
delegateTypeBuilder.addMethod(
MethodSpec.methodBuilder("setEditor")
.addModifiers(Modifier.PROTECTED)
.returns(void.class)
.addAnnotation(Override.class)
.addParameter(Editor.class, "editor")
.addStatement("this.editor = editor")
.build());
}

delegateTypeBuilder.addMethod(
MethodSpec.methodBuilder("getObject")
Expand All @@ -327,14 +390,25 @@ protected ClassName getEditorDelegate(EditorModel editorModel, EditorProperty da
.addStatement("return object")
.build());

delegateTypeBuilder.addMethod(
MethodSpec.methodBuilder("setObject")
.addModifiers(Modifier.PROTECTED)
.returns(void.class)
.addAnnotation(Override.class)
.addParameter(ClassName.get(Object.class), "object")
.addStatement("this.object = ($T) object", ClassName.get(data.getEditedType()))
.build());
if (data.getEditedType() != null) {
delegateTypeBuilder.addMethod(
MethodSpec.methodBuilder("setObject")
.addModifiers(Modifier.PROTECTED)
.returns(void.class)
.addAnnotation(Override.class)
.addParameter(ClassName.get(data.getEditedType()), "object")
.addStatement("this.object = object")
.build());
} else {
delegateTypeBuilder.addMethod(
MethodSpec.methodBuilder("setObject")
.addModifiers(Modifier.PROTECTED)
.returns(void.class)
.addAnnotation(Override.class)
.addParameter(ClassName.get(Object.class), "object")
.addStatement("this.object = ($T) object", ClassName.get(data.getEditedType()))
.build());
}

MethodSpec.Builder initializeSubDelegatesBuilder =
MethodSpec.methodBuilder("initializeSubDelegates")
Expand Down Expand Up @@ -520,18 +594,49 @@ private ClassName getEditorContext(EditorProperty parent, EditorProperty data) {
MethodSpec.methodBuilder("checkAssignment")
.addModifiers(Modifier.PUBLIC)
.addAnnotation(Override.class)
.addAnnotation(
AnnotationSpec.builder(SuppressWarnings.class)
.addMember("value", "$S", "unchecked")
.build())
.returns(ClassName.get(data.getEditedType()))
.addParameter(Object.class, "value")
.addStatement("return ($T) value", ClassName.get(data.getEditedType()))
.build());

contextTypeBuilder.addMethod(
MethodSpec.methodBuilder("getEditedType")
.addModifiers(Modifier.PUBLIC)
.addAnnotation(Override.class)
.returns(Class.class)
.addStatement("return $L.class", MoreTypes.asElement(data.getEditedType()))
.build());
if (MoreTypes.asDeclared(data.getEditorType()).getTypeArguments().size() > 1) {
contextTypeBuilder.addMethod(
MethodSpec.methodBuilder("getEditedType")
.addModifiers(Modifier.PUBLIC)
.addAnnotation(Override.class)
.addAnnotation(
AnnotationSpec.builder(SuppressWarnings.class)
.addMember("value", "$S", "unchecked")
.build())
.returns(
ParameterizedTypeName.get(
ClassName.get(Class.class), ClassName.get(data.getEditedType())))
.addStatement(
"return ($T<$T>) ($T) $L.class",
ClassName.get(Class.class),
ClassName.get(data.getEditedType()),
ClassName.get(Class.class),
MoreTypes.asElement(data.getEditedType()))
.build());
} else {
contextTypeBuilder.addMethod(
MethodSpec.methodBuilder("getEditedType")
.addModifiers(Modifier.PUBLIC)
.addAnnotation(Override.class)
.addAnnotation(
AnnotationSpec.builder(SuppressWarnings.class)
.addMember("value", "$S", "unchecked")
.build())
.returns(
ParameterizedTypeName.get(
ClassName.get(Class.class), ClassName.get(data.getEditedType())))
.addStatement("return $L.class", MoreTypes.asElement(data.getEditedType()))
.build());
}

contextTypeBuilder.addMethod(
MethodSpec.methodBuilder("getFromModel")
Expand Down