Commit e2c98c4a authored by iSergio's avatar iSergio
Browse files

Code refactoring

parent 28d22303

cesiumjs4gwt-main/src/main/java/org/cesiumjs/cs/CesiumEntryPoint.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ public class CesiumEntryPoint implements EntryPoint { 
        Cesium.fixSmartGWT();

        GWT.log("Cesium GTW module loaded");

        if (!Cesium.isInitialized()) {

            String message = "The Core of Cesium (Cesium.js) JavaScript libraryes not loaded.\n"

            String message = "The Core of Cesium (Cesium.js) JavaScript libraries not loaded.\n"

                    + "If you inherit Cesium from NoScript gwt.xml, \nyou need include <script src='..../Cesium.js'> "

                    + "to load Cesium, \nalso you need include necessary css (Example: <link type=\"text/css\" href=\".../Cesium/Widgets/widget.css\">.\n"

                    + "By default Cesium path is [GWT App Name]/js/Cesium";

cesiumjs4gwt-main/src/main/java/org/cesiumjs/linker/CesiumLinker.java

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class CesiumLinker extends AbstractLinker { 
            // It need for inject css files for example - Viewer

            if (partialPath.endsWith("/Cesium.js")) {

                String contents = CesiumLinkerUtils.getContents(emittedArtifact, logger);

                StringBuffer sb = new StringBuffer(contents);

                StringBuilder sb = new StringBuilder(contents);

                sb.insert(0, "window.CesiumPath = '" + context.getModuleName() + "/js/';\n");

                toReturn.remove(emittedArtifact);

                toReturn.add(emitString(logger, sb.toString(), partialPath));

cesiumjs4gwt-main/src/main/java/org/cesiumjs/linker/CesiumScriptInjector.java

+10 −9
Original line number Diff line number Diff line
@@ -54,8 +54,7 @@ public class CesiumScriptInjector extends AbstractLinker { 
        for (String binding : pathBindings) {

            String[] parts = binding.split("=");

            if (parts.length == 2 && moduleName.equals(parts[0])) {

                System.out

                        .println("      Setting page-relative module path for module '" + moduleName + "' using gwt.xml config");

                System.out.println("      Setting page-relative module path for module '" + moduleName + "' using gwt.xml config");

                return parts[1];

            }

        }
@@ -73,7 +72,7 @@ public class CesiumScriptInjector extends AbstractLinker { 
                        TreeLogger.class, String.class);

                module = (ModuleDef) getModuleDef.invoke(null, logger, moduleName);

            } else if (gwtVersion < 2.8f) {

                Class compilerContextClass = Class.forName("com.google.gwt.dev.CompilerContext");

                Class<?> compilerContextClass = Class.forName("com.google.gwt.dev.CompilerContext");

                Object context = compilerContextClass.getDeclaredConstructor().newInstance();



                getModuleDef = ModuleDefLoader.class.getDeclaredMethod("loadFromClassPath",
@@ -102,17 +101,19 @@ public class CesiumScriptInjector extends AbstractLinker { 
    }



    private String getScriptLoadJS(Set<ScriptReference> scriptsToLoad, String pageRelativeModulePath) {

        String result = "if (!window." + LOADED_SCRIPTS + ") window." + LOADED_SCRIPTS + " = {};\n";

        StringBuilder result = new StringBuilder("if (!window." + LOADED_SCRIPTS + ") window." + LOADED_SCRIPTS + " = {};\n");

        for (ScriptReference script : scriptsToLoad) {

            String src = script.getSrc();

            if (!src.startsWith("cs/")) {

                continue;

            }

            result += "if (!" + LOADED_SCRIPTS + "['" + src + "']) {\n  " + LOADED_SCRIPTS + "['" + src + "'] = true;\n  "

                    + "document.write('<script src=\"" + pageRelativeModulePath + "/" + src + "\">" + "</script>');\n}\n";

            result.append("if (!" + LOADED_SCRIPTS + "['").append(src).append("']) {\n  ")

                    .append(LOADED_SCRIPTS).append("['").append(src).append("'] = true;\n  ")

                    .append("document.write('<script src=\"").append(pageRelativeModulePath)

                    .append("/").append(src).append("\">").append("</script>');\n}\n");

            System.out.println(src);

        }

        return result;

        return result.toString();

    }



    @Override
@@ -131,14 +132,14 @@ public class CesiumScriptInjector extends AbstractLinker { 
    @Override

    public ArtifactSet link(TreeLogger logger, LinkerContext context, ArtifactSet artifacts, boolean permutation)

            throws UnableToCompleteException {

        Float gwtVersion = Float.parseFloat(About.getGwtVersionNum().replaceFirst("([0-9]+\\.[0-9]+).*", "$1"));

        float gwtVersion = Float.parseFloat(About.getGwtVersionNum().replaceFirst("([0-9]+\\.[0-9]+).*", "$1"));

        String moduleName = context.getModuleName();



        if (permutation) {

            return artifacts;

        }



        Artifact scriptLoader = emitString(logger, "", SCRIPT_LOADER);

        Artifact<EmittedArtifact> scriptLoader = emitString(logger, "", SCRIPT_LOADER);

        ArtifactSet result = new ArtifactSet(artifacts);

        result.add(scriptLoader);