Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2014-05-13 17:33:56 -0400
committerTom Schindl2014-05-13 17:33:56 -0400
commit232169e8e8d9e548b017bb3f9d449634378ce12a (patch)
tree6a80b7c8e0c03ddbe4a312027d680253fff96e08
parente2bb6657fa3e5b05686d94413e1fd3f25854b83c (diff)
downloadorg.eclipse.efxclipse-232169e8e8d9e548b017bb3f9d449634378ce12a.tar.gz
org.eclipse.efxclipse-232169e8e8d9e548b017bb3f9d449634378ce12a.tar.xz
org.eclipse.efxclipse-232169e8e8d9e548b017bb3f9d449634378ce12a.zip
Bug 434803 - Upgrade to jdt.annotation 2.0
-rw-r--r--bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/fxml/ExtendedFXMLLoader.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/fxml/ExtendedFXMLLoader.java b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/fxml/ExtendedFXMLLoader.java
index 2380c7a51..08809b026 100644
--- a/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/fxml/ExtendedFXMLLoader.java
+++ b/bundles/runtime/org.eclipse.fx.core/src/org/eclipse/fx/core/fxml/ExtendedFXMLLoader.java
@@ -86,7 +86,7 @@ public class ExtendedFXMLLoader {
public static <T> T load(@NonNull ClassLoader cl,
@Nullable ResourceBundle resourceBundle, T root, @NonNull String path)
throws IOException {
- return ExtendedFXMLLoader.<T, Object> loadWithController(cl,
+ return ExtendedFXMLLoader.<T,T, Object> loadWithController(cl,
resourceBundle, root, null, path).getNode();
}
@@ -108,7 +108,7 @@ public class ExtendedFXMLLoader {
@Nullable ResourceBundle resourceBundle,
@Nullable Callback<Class<?>, Object> controllerFactory,
@NonNull String path) throws IOException {
- return loadWithController(cl, resourceBundle, null, controllerFactory, path);
+ return ExtendedFXMLLoader.<N,N,C>loadWithController(cl, resourceBundle, null, controllerFactory, path);
}
/**
@@ -129,8 +129,8 @@ public class ExtendedFXMLLoader {
*/
@SuppressWarnings("unchecked")
@NonNull
- public static <N, C> Data<N, C> loadWithController(@NonNull ClassLoader cl,
- @Nullable ResourceBundle resourceBundle, @Nullable N root,
+ public static <N, D extends N, C> Data<N, C> loadWithController(@NonNull ClassLoader cl,
+ @Nullable ResourceBundle resourceBundle, @Nullable D root,
@Nullable Callback<Class<?>, Object> controllerFactory,
@NonNull String path) throws IOException {
try {

Back to the top