← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/sweethome3d/oneiric-201108050311

« back to all changes in this revision

Viewing changes to src/com/eteks/sweethome3d/applet/AppletApplication.java

  • Committer: Bazaar Package Importer
  • Author(s): Gabriele Giacone
  • Date: 2010-05-29 13:17:46 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20100529131746-mix5l902gjywddob
Tags: 2.4+dfsg-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/com/eteks/sweethome3d/applet/AppletApplication.java
84
84
 * @author Emmanuel Puybaret
85
85
 */
86
86
public class AppletApplication extends HomeApplication {
87
 
  private static final String   FURNITURE_CATALOG_URLS_PARAMETER = "furnitureCatalogURLs";
88
 
  private static final String   TEXTURES_CATALOG_URLS_PARAMETER  = "texturesCatalogURLs";
89
 
  private static final String   PLUGIN_URLS_PARAMETER            = "pluginURLs";
90
 
  private static final String   WRITE_HOME_URL_PARAMETER         = "writeHomeURL";
91
 
  private static final String   READ_HOME_URL_PARAMETER          = "readHomeURL";
92
 
  private static final String   LIST_HOMES_URL_PARAMETER         = "listHomesURL";
93
 
  private static final String   READ_PREFERENCES_URL_PARAMETER   = "readPreferencesURL";
94
 
  private static final String   WRITE_PREFERENCES_URL_PARAMETER  = "writePreferencesURL";
95
 
  private static final String   DEFAULT_HOME_PARAMETER           = "defaultHome";
96
 
  private static final String   ENABLE_EXPORT_TO_SH3D            = "enableExportToSH3D";
97
 
  private static final String   ENABLE_EXPORT_TO_SVG             = "enableExportToSVG";
98
 
  private static final String   ENABLE_EXPORT_TO_OBJ             = "enableExportToOBJ";
99
 
  private static final String   ENABLE_PRINT_TO_PDF              = "enablePrintToPDF";
100
 
  private static final String   ENABLE_CREATE_PHOTO              = "enableCreatePhoto";
101
 
  private static final String   ENABLE_CREATE_VIDEO              = "enableCreateVideo";
102
 
  private static final String   SHOW_MEMORY_STATUS_PARAMETER     = "showMemoryStatus";
103
 
  private static final String   USER_LANGUAGE                    = "userLanguage";
 
87
  private static final String FURNITURE_CATALOG_URLS_PARAMETER       = "furnitureCatalogURLs";
 
88
  private static final String FURNITURE_RESOURCES_URL_BASE_PARAMETER = "furnitureResourcesURLBase";
 
89
  private static final String TEXTURES_CATALOG_URLS_PARAMETER        = "texturesCatalogURLs";
 
90
  private static final String TEXTURES_RESOURCES_URL_BASE_PARAMETER  = "texturesResourcesURLBase";
 
91
  private static final String PLUGIN_URLS_PARAMETER                  = "pluginURLs";
 
92
  private static final String WRITE_HOME_URL_PARAMETER               = "writeHomeURL";
 
93
  private static final String READ_HOME_URL_PARAMETER                = "readHomeURL";
 
94
  private static final String LIST_HOMES_URL_PARAMETER               = "listHomesURL";
 
95
  private static final String READ_PREFERENCES_URL_PARAMETER         = "readPreferencesURL";
 
96
  private static final String WRITE_PREFERENCES_URL_PARAMETER        = "writePreferencesURL";
 
97
  private static final String DEFAULT_HOME_PARAMETER                 = "defaultHome";
 
98
  private static final String ENABLE_EXPORT_TO_SH3D                  = "enableExportToSH3D";
 
99
  private static final String ENABLE_EXPORT_TO_SVG                   = "enableExportToSVG";
 
100
  private static final String ENABLE_EXPORT_TO_OBJ                   = "enableExportToOBJ";
 
101
  private static final String ENABLE_PRINT_TO_PDF                    = "enablePrintToPDF";
 
102
  private static final String ENABLE_CREATE_PHOTO                    = "enableCreatePhoto";
 
103
  private static final String ENABLE_CREATE_VIDEO                    = "enableCreateVideo";
 
104
  private static final String SHOW_MEMORY_STATUS_PARAMETER           = "showMemoryStatus";
 
105
  private static final String USER_LANGUAGE                          = "userLanguage";
104
106
  
105
107
  private JApplet         applet;
106
108
  private final String    name;
255
257
   * Returns the URL object matching the given <code>url</code> eventually relative to <code>codeBase</code>.
256
258
   */
257
259
  private URL getURLWithCodeBase(URL codeBase, String url) {
258
 
    if (url.length() > 0) {
 
260
    if (url != null 
 
261
        && url.length() > 0) {
259
262
      try {
260
263
        return new URL(codeBase, url);
261
264
      } catch (MalformedURLException ex) {
511
514
    if (this.userPreferences == null) {
512
515
      URL codeBase = this.applet.getCodeBase();
513
516
      final String furnitureCatalogURLs = getAppletParameter(this.applet, FURNITURE_CATALOG_URLS_PARAMETER, "catalog.zip");
 
517
      final String furnitureResourcesUrlBase = getAppletParameter(this.applet, FURNITURE_RESOURCES_URL_BASE_PARAMETER, null);
514
518
      final String texturesCatalogURLs = getAppletParameter(this.applet, TEXTURES_CATALOG_URLS_PARAMETER, "catalog.zip");
 
519
      final String texturesResourcesUrlBase = getAppletParameter(this.applet, TEXTURES_RESOURCES_URL_BASE_PARAMETER, null);
515
520
      final String readPreferencesURL = getAppletParameter(this.applet, READ_PREFERENCES_URL_PARAMETER, "");    
516
521
      final String writePreferencesURL = getAppletParameter(this.applet, WRITE_PREFERENCES_URL_PARAMETER, "");    
517
522
      final String userLanguage = getAppletParameter(this.applet, USER_LANGUAGE, null);    
518
523
      this.userPreferences = new AppletUserPreferences(
519
524
          getURLs(codeBase, furnitureCatalogURLs), 
 
525
          getURLWithCodeBase(codeBase, furnitureResourcesUrlBase), 
520
526
          getURLs(codeBase, texturesCatalogURLs),
 
527
          getURLWithCodeBase(codeBase, texturesResourcesUrlBase), 
521
528
          getURLWithCodeBase(codeBase, writePreferencesURL), 
522
529
          getURLWithCodeBase(codeBase, readPreferencesURL),
523
530
          userLanguage);