diff options
| author | Tom Schindl | 2014-05-13 21:08:48 +0000 |
|---|---|---|
| committer | Tom Schindl | 2014-05-13 21:08:48 +0000 |
| commit | d908c111b8fc16854798bb2587a4dc57cfdcbcbb (patch) | |
| tree | d22c83c921d57a55498e9da952877f47032906a9 | |
| parent | 0146ad7a9898d778758d9bad4d6596376e264137 (diff) | |
| download | org.eclipse.efxclipse-d908c111b8fc16854798bb2587a4dc57cfdcbcbb.tar.gz org.eclipse.efxclipse-d908c111b8fc16854798bb2587a4dc57cfdcbcbb.tar.xz org.eclipse.efxclipse-d908c111b8fc16854798bb2587a4dc57cfdcbcbb.zip | |
Bug 434803 - Upgrade to jdt.annotation 2.0
| -rwxr-xr-x | bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/InjectingFXMLLoader.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/InjectingFXMLLoader.java b/bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/InjectingFXMLLoader.java index dbbb33cee..7309d5231 100755 --- a/bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/InjectingFXMLLoader.java +++ b/bundles/runtime/org.eclipse.fx.ui.di/src/org/eclipse/fx/ui/di/InjectingFXMLLoader.java @@ -24,6 +24,7 @@ import org.eclipse.fx.core.fxml.ExtendedFXMLLoader; import org.eclipse.fx.osgi.util.OSGiFXMLLoader;
import org.eclipse.fx.osgi.util.OSGiFXMLLoader.FXMLData;
import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.wiring.BundleWiring;
@@ -35,7 +36,10 @@ import org.osgi.framework.wiring.BundleWiring; * the root node
*/
public abstract class InjectingFXMLLoader<N> implements FXMLBuilder<N> {
+ @Nullable
ResourceBundle resourceBundle;
+
+ @Nullable
BuilderFactory builderFactory;
/**
|