diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 49b67b4d5b..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,117 +0,0 @@ ---- -language: java -jdk: openjdk8 -sudo: required -dist: bionic -cache: - directories: - - $HOME/.m2 - - $HOME/.gradle -services: - - docker -addons: - apt: - update: true - packages: - - python - - python-pip - - docker-ce -stages: - - name: commit - if: (branch = master || branch = release) && type = pull_request - - name: integration - if: (branch = master || branch = release) && type != pull_request - - name: build - if: (branch = master || branch = release) && type != pull_request - - name: deploy - if: (branch = master || branch = release) && type != pull_request -env: - global: - - _JAVA_OPTIONS=-Xmx6g - - TERM=dumb - - HALE_GRADLE_CONSOLE=plain -notifications: - slack: - # https://docs.travis-ci.com/user/notifications/#configuring-slack-notifications - # - # Using environment variables here is not supported, unfortunately: https://github.com/travis-ci/travis-ci/issues/6387 - # With the Travis Ruby gem, the 'secure' value can be generated like this: - # - # > travis encrypt ":" --add notifications.slack - rooms: - - secure: "R12tWxP/LdhD27KVukEMVEkWykw0+mT3Lx2dsOSWjxqVwlhIKZ+2RCR0Q1GD+a/bfnDDX3T5YP5zvVUr/NQi42fkMsIrU37Aj6dIXfoCD18XW6MkeQ2HrNyEHPLsTY8OfEKaNLOmb4qQPQRSfPGEaF7iCUus3ApjLbji1bBgyqI=" - on_success: change - on_failure: always -jobs: - include: - - stage: commit - script: - # Output something every minute lest Travis kills the job - - while sleep 1m; do echo "=====[ still running after $SECONDS seconds... ]====="; done & - - ./build.sh commitStage - # Killing background sleep loop - - kill %1 - - stage: integration - script: - # Output something every minute lest Travis kills the job - - while sleep 1m; do echo "=====[ still running after $SECONDS seconds... ]====="; done & - # Make Docker daemon listen on TCP port 2375 for container-based integration tests - - 'export DOCKER_SYSTEMD_CONFIG="[Service]\nExecStart=\nExecStart=/usr/bin/dockerd -H fd:// -H tcp://127.0.0.1:2375"' - - sudo mkdir -p /etc/systemd/system/docker.service.d - - echo -e $DOCKER_SYSTEMD_CONFIG | sudo tee /etc/systemd/system/docker.service.d/override.conf > /dev/null - - sudo systemctl daemon-reload - - sudo service docker restart - - sleep 10 - - sudo systemctl status docker.service - # Pull Docker images required for integration tests - - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - docker pull kartoza/postgis - - ./build.sh integrationStage - # Killing background sleep loop - - kill %1 - - &build-hs - stage: build - env: - - PLATFORM=linux PRODUCT=HALE ARCH=x86_64 - deploy: - skip_cleanup: true - provider: s3 - access_key_id: ${AWS_ACCESS_KEY_ID} - secret_access_key: ${AWS_SECRET_ACCESS_KEY} - bucket: ${AWS_S3_BUCKET} - region: ${AWS_S3_REGION} - upload-dir: ${AWS_S3_BUCKET_TARGET_PATH}/${TRAVIS_BUILD_NUMBER} - local_dir: build/target - script: - # Output something every minute lest Travis kills the job - - while sleep 1m; do echo "=====[ still running after $SECONDS seconds... ]====="; done & - - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - mkdir -p build/target - - ./build.sh product -a ${ARCH} -o ${PLATFORM} ${ADDITIONAL_FLAGS} ${PRODUCT} - # Killing background sleep loop - - kill %1 - - <<: *build-hs - env: - - PLATFORM=windows PRODUCT=HALE ARCH=x86_64 - - <<: *build-hs - env: - - PLATFORM=macosx PRODUCT=HALE ARCH=x86_64 - before_install: - - sudo apt -qq update - # genisoimage is required for creating the dmg image - - sudo apt install -y genisoimage - - <<: *build-hs - if: branch = master - env: - - PLATFORM=linux PRODUCT=Infocenter ARCH=x86_64 - - <<: *build-hs - if: branch = release - env: - - PLATFORM=linux PRODUCT=Infocenter ARCH=x86_64 ADDITIONAL_FLAGS="--publish --latest" - - stage: deploy - before_install: - - pip install awscli - script: - - cd build && ./upload-site.sh -# - stage: deploy -# - cd build && ./build.sh deployArtifacts diff --git a/apply-preferences.groovy b/apply-preferences.groovy deleted file mode 100755 index 34dc9be290..0000000000 --- a/apply-preferences.groovy +++ /dev/null @@ -1,340 +0,0 @@ -#!/usr/bin/env groovy - -import java.text.DateFormat -import java.util.Map.Entry -import java.util.jar.Manifest - -/* - * Class and interface definitions - */ - -class SortedProperties extends Properties { - - synchronized Enumeration keys() { - Enumeration keysEnum = super.keys() - Vector keyList = new Vector() - while (keysEnum.hasMoreElements()) { - keyList.add(keysEnum.nextElement()) - } - Collections.sort(keyList) - return keyList.elements() - } - -} - -interface ProjectFilter { - - /** - * Determines if a project shall be processed - * - * @param projectDir the project directory - * - * @return if the project is accepted - */ - boolean acceptProject(File projectDir); - -} - -class ProjectPreferencesApplier { - - private final Map defaults = [:] - - private static final DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM) - - /** - * Load default preferences from all .prefs files in the given directory - * - * @param prefsPath the path to the default preferences directory - * - * @return if any preference files were found - */ - boolean loadDefaults(File path) { - File[] prefFiles = path.listFiles(new FilenameFilter() { - - public boolean accept(File dir, String name) { - return name.toLowerCase().endsWith(".prefs") - } - - }); - - boolean foundPreferences = false - - if (prefFiles != null) { - for (File prefFile : prefFiles) { - SortedProperties properties = new SortedProperties() - try { - properties.load(new BufferedReader(new FileReader(prefFile))) - if (properties.isEmpty()) { - println("Warning: empty preference file: " + prefFile.getAbsolutePath()) - } - - String key = prefFile.getName() - defaults.put(key, properties) - foundPreferences = true - - // println("Loaded default preferences: " + prefFile.getName()) - } catch (FileNotFoundException e) { - // ignore - } catch (IOException e) { - println("Error reading preference file: " + prefFile.getAbsolutePath()) - } - } - - println('Loaded preferences from: ' + path as String) - } - - return foundPreferences - } - - /** - * Apply the preference defaults to projects found in the given search path - * - * @param searchPath the search path - * @param projectFilter the project filter - */ - public void applyDefaults(File searchPath, ProjectFilter projectFilter) { - Collection projectDirs = findProjectDirectories(searchPath, true) - - int ignored = 0 - - for (File projectDir : projectDirs) { - if (projectFilter.acceptProject(projectDir)) { - // apply project preferences - applyProjectDefaults(projectDir) - } - else { - ignored++ - } - } - - println("Ignored " + ignored + " project directories.") - } - - /** - * Apply the project preference defaults to the project in the given - * directory - * - * @param projectDir the project direktory - */ - private void applyProjectDefaults(File projectDir) { - // settings directory - File settingsDir = new File(projectDir, ".settings") - if (!settingsDir.exists()) { - settingsDir.mkdir() - } - - boolean success = true; - - for (Entry entry : defaults.entrySet()) { - String filename = entry.getKey() - SortedProperties defaults = entry.getValue() - - File propertiesFile = new File(settingsDir, filename) - if (propertiesFile.exists()) { - // apply defaults to existing file - SortedProperties current = new SortedProperties() - try { - current.load(new BufferedReader(new FileReader(propertiesFile))) - - boolean changed = false - - // copy defaults - Enumeration en = defaults.keys() - while (en.hasMoreElements()) { - String key = (String) en.nextElement() - - String defaultValue = defaults.getProperty(key) - String oldValue = current.getProperty(key) - - if (oldValue == null || !oldValue.equals(defaultValue)) { - current.setProperty(key, defaultValue) - - changed = true - } - } - - // save file - if (changed) { - current.store(new FileWriter(propertiesFile), "Updated from default preferences " + dateFormat.format(new Date())) - } - } catch (FileNotFoundException e) { - e.printStackTrace() - success = false - } catch (IOException e) { - println("Error updating preferences '" + filename + "' for project in " + projectDir.getAbsolutePath()) - success = false - } - } - else { - // create initial file - try { - defaults.store(new FileWriter(propertiesFile), "Created from default preferences " + dateFormat.format(new Date())) - } catch (IOException e) { - println("Error saving default preferences '" + filename + "' for project in " + projectDir.getAbsolutePath()) - success = false - } - } - } - - if (success) { - println("Successfully updated project preferences for " + projectDir.getName()) - } - } - - /** - * Find the project directories in the given search path - * - * @param searchPath the search path - * @param searchInProjects if inside project directories shall also be searched for projects - * - * @return the project directories - */ - private Collection findProjectDirectories(File searchPath, - boolean searchInProjects) { - List projectDirs = [] - - boolean project = false; - File projectFile = new File(searchPath, ".project") - File classpathFile = new File(searchPath, ".classpath") // check also for classpath file to filter non-Java projects - if (projectFile.exists() && classpathFile.exists()) { - // search path is project dir - projectDirs.add(searchPath); - project = true; - } - - if (!project || searchInProjects) { - File[] candidates = searchPath.listFiles(new FilenameFilter() { - - public boolean accept(File dir, String name) { - // ignore files starting with . - if (name.startsWith(".")) { - return false - } - - // ignore build directories - if (name.equals("build")) { - return false - } - - return true - } - }); - - if (candidates != null) { - for (File candidate : candidates) { - projectDirs.addAll(findProjectDirectories(candidate, false)) - } - } - } - - return projectDirs - } - -} - -void apply(File prefs, File searchPath, ProjectFilter projectFilter = { File projectDir -> true }) { - ProjectPreferencesApplier applier = new ProjectPreferencesApplier() - if (!applier.loadDefaults(prefs)) { - println("No preference files found in " + prefs + ".") - } - else { - applier.applyDefaults(searchPath, projectFilter) - } -} - - -/* - * Script - */ - -// filter that detects Java 8 projects and updates the classpath setting -def isJava8 = { File projectDir -> - File manifestFile = new File(new File(projectDir, 'META-INF'), 'MANIFEST.MF') - boolean match = false - if (manifestFile.exists()) { - manifestFile.withInputStream { - def manifest = new Manifest(it) - def attributes = manifest.getMainAttributes() - def env = attributes.getValue('Bundle-RequiredExecutionEnvironment') - match = (env == 'JavaSE-1.8') - } - } - - if (match) { - // update to Java 8 -> also replace classpath setting - // XXX kind of a hack to do it in the filter - File classpathFile = new File(projectDir, '.classpath') - if (classpathFile.exists()) { - def fileContent = classpathFile.text - def java7cp = 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7' - def java8cp = 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8' - def java17cp = 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17' - def java18cp = 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-18' - if (fileContent.contains(java8cp)) { - classpathFile.text = fileContent.replace(java8cp, java18cp) - } - } - } - - match -} - -// filter that detects Java 8 projects and updates the classpath setting -def isJava18 = { File projectDir -> - File manifestFile = new File(new File(projectDir, 'META-INF'), 'MANIFEST.MF') - boolean match = false - if (manifestFile.exists()) { - manifestFile.withInputStream { - def manifest = new Manifest(it) - def attributes = manifest.getMainAttributes() - def env = attributes.getValue('Bundle-RequiredExecutionEnvironment') - match = (env == 'JavaSE-1.8') - } - } - - if (match) { - // update to Java 8 -> also replace classpath setting - // XXX kind of a hack to do it in the filter - File classpathFile = new File(projectDir, '.classpath') - if (classpathFile.exists()) { - def fileContent = classpathFile.text - def java7cp = 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7' - def java8cp = 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8' - def java17cp = 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17' - def java18cp = 'org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-18' - if (fileContent.contains(java18cp)) { - classpathFile.text = fileContent.replace(java18cp, java17cp) - } - } - } - - match -} - -// apply preferences to projects - -def java7 = 'platform/preferences/java7' as File -def java8 = 'platform/preferences/java8' as File -def java17 = 'platform/preferences/java17' as File -def java18 = 'platform/preferences/java18' as File -def searchPaths = ['common', 'cst', 'io', 'server', 'doc', 'ui', 'util', 'app', 'ext/styledmap', 'ext/geom', 'ext/adv'] - -searchPaths.each { - // default: Java 8 - apply(java17, it as File, { !isJava18(it) } as ProjectFilter) - // Java 17 - apply(java17, it as File, isJava18 as ProjectFilter) -} - -//searchPaths.each { - // default: Java 8 -// apply(java18, it as File, { !isJava8(it) } as ProjectFilter) - // Java 8 -// apply(java18, it as File, isJava8 as ProjectFilter) -//} - -// external contributions w/ different project settings - -apply('platform/preferences/xslt' as File, 'ext/xslt' as File) -apply('platform/preferences/xslt' as File, 'ext/ageobw' as File) -apply('platform/preferences/mdl' as File, 'ext/mdl' as File) diff --git a/build-hale.sh b/build-hale.sh deleted file mode 100755 index 057099baac..0000000000 --- a/build-hale.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# Default HALE builds -./build.sh clean -./build.sh product HALE -o linux -a x86_64 -#./build.sh product HALE -o linux -a x86 -./build.sh product HALE -o windows -a x86_64 -#./build.sh product HALE -o windows -a x86 -./build.sh product HALE -o macosx -a x86_64 diff --git a/build.bat b/build.bat deleted file mode 100644 index b924d7c675..0000000000 --- a/build.bat +++ /dev/null @@ -1,9 +0,0 @@ -@echo off -SetLocal EnableDelayedExpansion - -set ARGS=%* -if NOT "%ARGS%" == "" ( - set ARGS=!ARGS:"=\"! -) - -build\gradlew -p build --stacktrace cli -Pargs="%ARGS%" diff --git a/build.sh b/build.sh deleted file mode 100755 index 56f60e492b..0000000000 --- a/build.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -if [ -z $HALE_GRADLE_CONSOLE ]; then - HALE_GRADLE_CONSOLE=auto -fi -./build/gradlew -p build --console $HALE_GRADLE_CONSOLE -Dorg.gradle.daemon=true --stacktrace cli -Pargs="$*" diff --git a/buildSrc/src/main/groovy/HaleProjectExtension.groovy b/buildSrc/src/main/groovy/HaleProjectExtension.groovy index f222400e72..96c10496d4 100644 --- a/buildSrc/src/main/groovy/HaleProjectExtension.groovy +++ b/buildSrc/src/main/groovy/HaleProjectExtension.groovy @@ -6,4 +6,6 @@ class HaleProjectExtension { String bundleName = null String bundleSymbolicName = null boolean singletonBundle = false + String fragmentHost = null + String bundleVendor = null } diff --git a/buildSrc/src/main/groovy/hale.library-conventions.gradle b/buildSrc/src/main/groovy/hale.library-conventions.gradle index 573e00a826..30f9b61c1d 100644 --- a/buildSrc/src/main/groovy/hale.library-conventions.gradle +++ b/buildSrc/src/main/groovy/hale.library-conventions.gradle @@ -39,7 +39,7 @@ jar { bnd( 'Bundle-SymbolicName': useSymName, 'Automatic-Module-Name': symName, - 'Bundle-Vendor': 'wetransform GmbH' + 'Bundle-Vendor': project.hale.bundleVendor ?: 'wetransform GmbH' ) if (project.hale.activator) { @@ -50,6 +50,12 @@ jar { 'Bundle-ActivationPolicy': 'lazy' ) } + + if (project.hale.fragmentHost) { + bnd( + 'Fragment-Host': project.hale.fragmentHost + ) + } } } } diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/assignBound/assignBound.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/assignBound/assignBound.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/assignBound/assignBound.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/assignBound/assignBound.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/assignBound/help.xhtml b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/assignBound/help.xhtml similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/assignBound/help.xhtml rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/assignBound/help.xhtml diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/classification/addFile.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/classification/addFile.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/classification/addFile.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/classification/addFile.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/classification/addSource.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/classification/addSource.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/classification/addSource.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/classification/addSource.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/classification/help.xhtml b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/classification/help.xhtml similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/classification/help.xhtml rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/classification/help.xhtml diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/classification/sourceValue.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/classification/sourceValue.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/classification/sourceValue.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/classification/sourceValue.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/classification/unmapped.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/classification/unmapped.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/classification/unmapped.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/classification/unmapped.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/contexts.xml b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/contexts.xml similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/contexts.xml rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/contexts.xml diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/Formatted_string.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/formattedString/Formatted_string.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/Formatted_string.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/formattedString/Formatted_string.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/Formatted_string_mapping.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/formattedString/Formatted_string_mapping.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/Formatted_string_mapping.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/formattedString/Formatted_string_mapping.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/help.xhtml b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/formattedString/help.xhtml similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/help.xhtml rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/formattedString/help.xhtml diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/join.xhtml b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/join.xhtml similarity index 90% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/join.xhtml rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/join.xhtml index ff307988a6..cba0f67a76 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.align/help/join.xhtml +++ b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/join.xhtml @@ -24,9 +24,9 @@ and so on.

- +
- +

Conditions

@@ -38,10 +38,10 @@ equal the instance is used. A particular instance may match more than one instance of the previous types and will then be used each time.

- +

To create a condition, select a property on the left and on the right side, then click on the button in the middle.

- \ No newline at end of file + diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/join_condition.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/join_condition.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/join_condition.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/join_condition.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/join_order.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/join_order.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/join_order.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/join_order.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/merge/autoDetect.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/merge/autoDetect.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/merge/autoDetect.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/merge/autoDetect.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/merge/help.xhtml b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/merge/help.xhtml similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/merge/help.xhtml rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/merge/help.xhtml diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/merge/mergeAggregate.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/merge/mergeAggregate.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/merge/mergeAggregate.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/merge/mergeAggregate.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/merge/mergeKey.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/merge/mergeKey.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/merge/mergeKey.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/merge/mergeKey.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/merge/mergeMapping.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/merge/mergeMapping.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/help/merge/mergeMapping.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/help/merge/mergeMapping.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/icons/augmentation.gif b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/icons/augmentation.gif similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/icons/augmentation.gif rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/icons/augmentation.gif diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/icons/merge.gif b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/icons/merge.gif similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/icons/merge.gif rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/icons/merge.gif diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/icons/propertyFunction.gif b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/icons/propertyFunction.gif similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/icons/propertyFunction.gif rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/icons/propertyFunction.gif diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/icons/text.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/icons/text.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/icons/text.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/icons/text.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/icons/typeFunction.png b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/icons/typeFunction.png similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/icons/typeFunction.png rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/icons/typeFunction.png diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/plugin.xml b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/plugin.xml similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/plugin.xml rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/plugin.xml diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/schema/eu.esdihumboldt.hale.align.annotation.exsd b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/schema/eu.esdihumboldt.hale.align.annotation.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/schema/eu.esdihumboldt.hale.align.annotation.exsd rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/schema/eu.esdihumboldt.hale.align.annotation.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/schema/eu.esdihumboldt.hale.align.category.exsd b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/schema/eu.esdihumboldt.hale.align.category.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/schema/eu.esdihumboldt.hale.align.category.exsd rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/schema/eu.esdihumboldt.hale.align.category.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/schema/eu.esdihumboldt.hale.align.compatibility.exsd b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/schema/eu.esdihumboldt.hale.align.compatibility.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/schema/eu.esdihumboldt.hale.align.compatibility.exsd rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/schema/eu.esdihumboldt.hale.align.compatibility.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/schema/eu.esdihumboldt.hale.align.engine.exsd b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/schema/eu.esdihumboldt.hale.align.engine.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/schema/eu.esdihumboldt.hale.align.engine.exsd rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/schema/eu.esdihumboldt.hale.align.engine.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/schema/eu.esdihumboldt.hale.align.function.exsd b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/schema/eu.esdihumboldt.hale.align.function.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/schema/eu.esdihumboldt.hale.align.function.exsd rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/schema/eu.esdihumboldt.hale.align.function.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/schema/eu.esdihumboldt.hale.align.transformation.exsd b/common/plugins/eu.esdihumboldt.hale.common.align/resources/main/schema/eu.esdihumboldt.hale.align.transformation.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.align/schema/eu.esdihumboldt.hale.align.transformation.exsd rename to common/plugins/eu.esdihumboldt.hale.common.align/resources/main/schema/eu.esdihumboldt.hale.align.transformation.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/xbuild.gradle b/common/plugins/eu.esdihumboldt.hale.common.align/xbuild.gradle new file mode 100644 index 0000000000..93e758c6af --- /dev/null +++ b/common/plugins/eu.esdihumboldt.hale.common.align/xbuild.gradle @@ -0,0 +1,19 @@ +plugins { + id 'hale.migrated-groovy' +} + +hale { + bundleName = 'HALE Alignment API' + + singletonBundle = true +} + +dependencies { + implementation libs.slf4jplus.api + + implementation libs.groovy.core + + implementation libs.guava + + testImplementation testLibs.junit4 +} diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.classpath b/common/plugins/eu.esdihumboldt.hale.common.cache.test/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.project b/common/plugins/eu.esdihumboldt.hale.common.cache.test/.project deleted file mode 100644 index 6282de837d..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - eu.esdihumboldt.hale.common.cache.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/edu.umd.cs.findbugs.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index ba24ce1e48..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Updated from default preferences Apr 11, 2014 12:49:52 PM -#Fri Apr 11 12:49:52 CEST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.core.resources.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 35f54a004a..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 20.05.2011 09:41:37 -#Fri May 20 09:41:37 CEST 2011 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.jdt.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bf62d79382..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:28 -#Fri Oct 28 08:10:28 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.jdt.groovy.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index fc30939392..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Updated from default preferences Aug 24, 2023 2:24:30 PM -#Thu Aug 24 14:24:30 CEST 2023 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.jdt.launching.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 8e9e6e8526..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 20.05.2011 09:41:37 -#Fri May 20 09:41:37 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.jdt.ui.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 46646fbb60..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Updated from default preferences Jul 9, 2016 10:07:16 AM -#Sat Jul 09 10:07:16 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.pde.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index cc87a1a538..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Nov 7, 2012 11:02:21 AM -#Wed Nov 07 11:02:21 CET 2012 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.pde.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.pde.prefs deleted file mode 100644 index a4af5f8aab..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:35 PM -#Wed Jul 25 13:58:35 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.cache.test/META-INF/MANIFEST.MF deleted file mode 100644 index 9f2f8ff25c..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/META-INF/MANIFEST.MF +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: HALE Cache Tests -Bundle-SymbolicName: eu.esdihumboldt.hale.common.cache.test -Bundle-Version: 5.4.0.qualifier -Fragment-Host: eu.esdihumboldt.hale.common.cache;bundle-version="2.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-Vendor: data harmonisation panel -Automatic-Module-Name: eu.esdihumboldt.hale.common.cache.test -Import-Package: org.junit diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/build.properties b/common/plugins/eu.esdihumboldt.hale.common.cache.test/build.properties deleted file mode 100644 index 34d2e4d2da..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/.classpath b/common/plugins/eu.esdihumboldt.hale.common.cache/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/.project b/common/plugins/eu.esdihumboldt.hale.common.cache/.project deleted file mode 100644 index 6e7b80b2d1..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - eu.esdihumboldt.hale.common.cache - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/edu.umd.cs.findbugs.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index ba24ce1e48..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Updated from default preferences Apr 11, 2014 12:49:52 PM -#Fri Apr 11 12:49:52 CEST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.core.resources.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 35f54a004a..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 20.05.2011 09:41:37 -#Fri May 20 09:41:37 CEST 2011 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.jdt.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bf62d79382..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:28 -#Fri Oct 28 08:10:28 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.jdt.groovy.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index 31772090f1..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:28 -#Fri Oct 28 08:10:28 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.jdt.launching.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 8e9e6e8526..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 20.05.2011 09:41:37 -#Fri May 20 09:41:37 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.jdt.ui.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 46646fbb60..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Updated from default preferences Jul 9, 2016 10:07:16 AM -#Sat Jul 09 10:07:16 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.pde.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index cc87a1a538..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Nov 7, 2012 11:02:21 AM -#Wed Nov 07 11:02:21 CET 2012 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.pde.prefs b/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.pde.prefs deleted file mode 100644 index a4af5f8aab..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:35 PM -#Wed Jul 25 13:58:35 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.cache/META-INF/MANIFEST.MF deleted file mode 100644 index 0f198951a6..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/META-INF/MANIFEST.MF +++ /dev/null @@ -1,31 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: HALE Cache -Bundle-SymbolicName: eu.esdihumboldt.hale.common.cache;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.io;version="9.0.0", - de.fhg.igd.osgi.util, - de.fhg.igd.osgi.util.configuration, - de.fhg.igd.slf4jplus, - eu.esdihumboldt.util, - eu.esdihumboldt.util.http, - eu.esdihumboldt.util.http.client, - eu.esdihumboldt.util.io, - eu.esdihumboldt.util.metrics, - net.sf.ehcache, - net.sf.ehcache.config, - net.sf.ehcache.store, - org.apache.http.client, - org.apache.log4j, - org.osgi.framework, - org.slf4j;version="1.5.11" -Require-Bundle: org.apache.httpcomponents.httpclient;bundle-version="4.5.13", - org.apache.httpcomponents.httpcore;bundle-version="4.4.13", - org.eclipse.core.runtime;bundle-version="3.7.0", - groovy;bundle-version="2.5.19" -Bundle-ActivationPolicy: lazy -Bundle-Activator: eu.esdihumboldt.hale.common.cache.Activator -Bundle-Vendor: data harmonisation panel -Automatic-Module-Name: eu.esdihumboldt.hale.common.cache -Export-Package: eu.esdihumboldt.hale.common.cache diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/build.gradle b/common/plugins/eu.esdihumboldt.hale.common.cache/build.gradle new file mode 100644 index 0000000000..1ebc6d10ae --- /dev/null +++ b/common/plugins/eu.esdihumboldt.hale.common.cache/build.gradle @@ -0,0 +1,33 @@ +plugins { + id 'hale.migrated-java' +} + +hale { + bundleName = 'HALE Cache' + + activator = 'eu.esdihumboldt.hale.common.cache.Activator' + lazyActivation = true + + singletonBundle = true +} + +dependencies { + implementation libs.slf4jplus.api + + implementation libs.groovy.templates + + implementation libs.guava + + implementation libs.igd.osgi.util + + implementation libs.eclipse.core.runtime + + implementation libs.ehcache + + implementation libs.apache.http.client + + implementation project(':util:plugins:eu.esdihumboldt.util') + implementation project(':util:plugins:eu.esdihumboldt.util.http') + + testImplementation testLibs.junit4 +} diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/build.properties b/common/plugins/eu.esdihumboldt.hale.common.cache/build.properties deleted file mode 100644 index 34d2e4d2da..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.cache/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/src/eu/esdihumboldt/hale/common/cache/ehcache.xml b/common/plugins/eu.esdihumboldt.hale.common.cache/resources/main/eu/esdihumboldt/hale/common/cache/ehcache.xml similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.cache/src/eu/esdihumboldt/hale/common/cache/ehcache.xml rename to common/plugins/eu.esdihumboldt.hale.common.cache/resources/main/eu/esdihumboldt/hale/common/cache/ehcache.xml diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/src/eu/esdihumboldt/hale/common/cache/RequestTest.java b/common/plugins/eu.esdihumboldt.hale.common.cache/test/eu/esdihumboldt/hale/common/cache/RequestTest.java similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.cache.test/src/eu/esdihumboldt/hale/common/cache/RequestTest.java rename to common/plugins/eu.esdihumboldt.hale.common.cache/test/eu/esdihumboldt/hale/common/cache/RequestTest.java diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/.classpath b/common/plugins/eu.esdihumboldt.hale.common.core.test/.classpath deleted file mode 100644 index 5a78e49c83..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core.test/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/.project b/common/plugins/eu.esdihumboldt.hale.common.core.test/.project deleted file mode 100644 index d6b356a6d8..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core.test/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - eu.esdihumboldt.hale.common.core.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.jdt.groovy.core.groovyNature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/edu.umd.cs.findbugs.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index ba24ce1e48..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Updated from default preferences Apr 11, 2014 12:49:52 PM -#Fri Apr 11 12:49:52 CEST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.core.resources.prefs b/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 35f54a004a..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 20.05.2011 09:41:37 -#Fri May 20 09:41:37 CEST 2011 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.jdt.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bf62d79382..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:28 -#Fri Oct 28 08:10:28 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.jdt.groovy.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index 74af1ba777..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.jdt.launching.prefs b/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 8e9e6e8526..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 20.05.2011 09:41:37 -#Fri May 20 09:41:37 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.jdt.ui.prefs b/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 46646fbb60..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Updated from default preferences Jul 9, 2016 10:07:16 AM -#Sat Jul 09 10:07:16 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.pde.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 427c634cfb..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue Apr 19 13:32:08 CEST 2011 -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.pde.prefs b/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.pde.prefs deleted file mode 100644 index a4af5f8aab..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core.test/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:35 PM -#Wed Jul 25 13:58:35 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.core.test/META-INF/MANIFEST.MF deleted file mode 100644 index be98f2b377..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core.test/META-INF/MANIFEST.MF +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: HALE Core API Tests -Bundle-SymbolicName: eu.esdihumboldt.hale.common.core.test -Bundle-Version: 5.4.0.qualifier -Fragment-Host: eu.esdihumboldt.hale.common.core;bundle-version="2.5.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-Vendor: data harmonisation panel -Automatic-Module-Name: eu.esdihumboldt.hale.common.core.test -Require-Bundle: org.junit;bundle-version="4.13.0" diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/build.properties b/common/plugins/eu.esdihumboldt.hale.common.core.test/build.properties deleted file mode 100644 index dade6f0305..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core.test/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/ -output.. = bin/ -sourceFileExtensions=*.java, *.groovy -compilerAdapter=org.codehaus.groovy.eclipse.ant.GroovyCompilerAdapter -compilerAdapter.useLog=true -bin.includes = META-INF/,\ - . diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/.classpath b/common/plugins/eu.esdihumboldt.hale.common.core/.classpath deleted file mode 100644 index 5a78e49c83..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/.project b/common/plugins/eu.esdihumboldt.hale.common.core/.project deleted file mode 100644 index a4b6c91442..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core/.project +++ /dev/null @@ -1,39 +0,0 @@ - - - eu.esdihumboldt.hale.common.core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - org.eclipse.pde.ds.core.builder - - - - - - org.eclipse.jdt.groovy.core.groovyNature - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/edu.umd.cs.findbugs.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.core/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index ba24ce1e48..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Updated from default preferences Apr 11, 2014 12:49:52 PM -#Fri Apr 11 12:49:52 CEST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.core.resources.prefs b/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 35f54a004a..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 20.05.2011 09:41:37 -#Fri May 20 09:41:37 CEST 2011 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.jdt.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bf62d79382..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:28 -#Fri Oct 28 08:10:28 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.jdt.groovy.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index 74af1ba777..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.jdt.launching.prefs b/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 8e9e6e8526..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 20.05.2011 09:41:37 -#Fri May 20 09:41:37 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.jdt.ui.prefs b/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 46646fbb60..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Updated from default preferences Jul 9, 2016 10:07:16 AM -#Sat Jul 09 10:07:16 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.pde.core.prefs b/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 8294496d77..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Oct 19 15:36:28 CEST 2011 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.pde.prefs b/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.pde.prefs deleted file mode 100644 index a4af5f8aab..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:35 PM -#Wed Jul 25 13:58:35 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.core/META-INF/MANIFEST.MF deleted file mode 100644 index cdf2adc66c..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core/META-INF/MANIFEST.MF +++ /dev/null @@ -1,79 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: HALE Core API -Bundle-SymbolicName: eu.esdihumboldt.hale.common.core;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-Activator: eu.esdihumboldt.hale.common.core.internal.CoreBundle -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.base;version="1.6.0", - com.google.common.collect, - com.google.common.io;version="17.0.0", - de.fhg.igd.eclipse.util.extension, - de.fhg.igd.eclipse.util.extension.simple, - de.fhg.igd.osgi.util;version="1.0.0", - de.fhg.igd.osgi.util.configuration;version="1.0.0", - de.fhg.igd.osgi.util.extender;version="1.0.0", - de.fhg.igd.slf4jplus, - edu.umd.cs.findbugs.annotations, - eu.esdihumboldt.hale.common.cache, - eu.esdihumboldt.hale.common.core.io.project.model, - eu.esdihumboldt.hale.common.core.io.project.model.internal.generated;version="2.9.0", - eu.esdihumboldt.hale.util.nonosgi, - eu.esdihumboldt.hale.util.nonosgi.contenttype.describer, - eu.esdihumboldt.util, - eu.esdihumboldt.util.definition, - eu.esdihumboldt.util.groovy.collector, - eu.esdihumboldt.util.groovy.json, - eu.esdihumboldt.util.groovy.xml, - eu.esdihumboldt.util.io, - eu.esdihumboldt.util.resource, - javax.measure;version="1.0.0", - javax.measure.quantity;version="1.0.0", - net.jcip.annotations, - org.apache.commons.io;version="1.4.0", - org.apache.commons.lang;version="2.4.0", - org.apache.http, - org.apache.http.client, - org.apache.http.impl, - org.apache.http.impl.client, - org.osgi.framework;version="1.3.0", - org.slf4j;version="1.5.11", - org.springframework.core.convert;version="5.2.0", - org.springframework.util;version="5.2.0" -Export-Package: eu.esdihumboldt.hale.common.core, - eu.esdihumboldt.hale.common.core.internal;x-internal:=true, - eu.esdihumboldt.hale.common.core.io, - eu.esdihumboldt.hale.common.core.io.config, - eu.esdihumboldt.hale.common.core.io.extension, - eu.esdihumboldt.hale.common.core.io.impl, - eu.esdihumboldt.hale.common.core.io.internal;x-internal:=true, - eu.esdihumboldt.hale.common.core.io.project, - eu.esdihumboldt.hale.common.core.io.project.extension, - eu.esdihumboldt.hale.common.core.io.project.extension.internal;x-internal:=true, - eu.esdihumboldt.hale.common.core.io.project.impl, - eu.esdihumboldt.hale.common.core.io.project.model, - eu.esdihumboldt.hale.common.core.io.project.model.impl, - eu.esdihumboldt.hale.common.core.io.project.model.internal;x-internal:=true, - eu.esdihumboldt.hale.common.core.io.project.util, - eu.esdihumboldt.hale.common.core.io.report, - eu.esdihumboldt.hale.common.core.io.report.impl, - eu.esdihumboldt.hale.common.core.io.supplier, - eu.esdihumboldt.hale.common.core.io.util, - eu.esdihumboldt.hale.common.core.parameter, - eu.esdihumboldt.hale.common.core.report, - eu.esdihumboldt.hale.common.core.report.impl, - eu.esdihumboldt.hale.common.core.report.util, - eu.esdihumboldt.hale.common.core.report.writer, - eu.esdihumboldt.hale.common.core.service, - eu.esdihumboldt.hale.common.core.service.cleanup, - eu.esdihumboldt.hale.common.core.service.cleanup.impl, - eu.esdihumboldt.hale.common.core.service.internal;x-internal:=true -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0", - groovy;bundle-version="2.5.19", - org.codehaus.castor.xml;bundle-version="1.4.1", - org.codehaus.castor.core;bundle-version="1.4.1", - xerces.xercesImpl;bundle-version="2.12.2", - jakarta.xml.bind-api;bundle-version="4.0.0" -Bundle-Vendor: data harmonisation panel -Automatic-Module-Name: eu.esdihumboldt.hale.common.core diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/build.gradle b/common/plugins/eu.esdihumboldt.hale.common.core/build.gradle new file mode 100644 index 0000000000..bc2faf286d --- /dev/null +++ b/common/plugins/eu.esdihumboldt.hale.common.core/build.gradle @@ -0,0 +1,42 @@ +plugins { + id 'hale.migrated-groovy' +} + +hale { + bundleName = 'HALE Core API' + + activator = 'eu.esdihumboldt.hale.common.core.internal.CoreBundle' + lazyActivation = true + + singletonBundle = true +} + +dependencies { + implementation libs.slf4jplus.api + + implementation libs.groovy.core + implementation libs.groovy.json + implementation libs.groovy.xml + + implementation libs.guava + implementation libs.commons.io + implementation libs.castor.xml + implementation libs.findbugs.annotations + + implementation libs.igd.eclipse.util + implementation libs.igd.osgi.util + + implementation libs.spring.core + + implementation project(':util:plugins:eu.esdihumboldt.util') + implementation project(':util:plugins:eu.esdihumboldt.util.groovy') + implementation project(':util:plugins:eu.esdihumboldt.util.resource') + + implementation project(':common:plugins:eu.esdihumboldt.hale.common.cache') + + implementation project(':ext:nonosgi:eu.esdihumboldt.hale.util.nonosgi') + + implementation libs.model.project + + testImplementation testLibs.junit4 +} diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/build.properties b/common/plugins/eu.esdihumboldt.hale.common.core/build.properties deleted file mode 100644 index 058b351dba..0000000000 --- a/common/plugins/eu.esdihumboldt.hale.common.core/build.properties +++ /dev/null @@ -1,9 +0,0 @@ -source.. = src/ -output.. = bin/ -sourceFileExtensions=*.java, *.groovy -compilerAdapter=org.codehaus.groovy.eclipse.ant.GroovyCompilerAdapter -compilerAdapter.useLog=true -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - schema/ diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/plugin.xml b/common/plugins/eu.esdihumboldt.hale.common.core/resources/main/plugin.xml similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core/plugin.xml rename to common/plugins/eu.esdihumboldt.hale.common.core/resources/main/plugin.xml diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.io.action.exsd b/common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.io.action.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.io.action.exsd rename to common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.io.action.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.io.complexvalue.exsd b/common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.io.complexvalue.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.io.complexvalue.exsd rename to common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.io.complexvalue.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.io.project.exsd b/common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.io.project.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.io.project.exsd rename to common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.io.project.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.io.provider.exsd b/common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.io.provider.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.io.provider.exsd rename to common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.io.provider.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.io.resource.exsd b/common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.io.resource.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.io.resource.exsd rename to common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.io.resource.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.parameter.exsd b/common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.parameter.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.parameter.exsd rename to common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.parameter.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.report.exsd b/common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.report.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.report.exsd rename to common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.report.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.service.exsd b/common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.service.exsd similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core/schema/eu.esdihumboldt.hale.service.exsd rename to common/plugins/eu.esdihumboldt.hale.common.core/resources/main/schema/eu.esdihumboldt.hale.service.exsd diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/report/impl/ReportImplDefintion.java b/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/report/impl/ReportImplDefintion.java index 48c42f6fa6..60c42ffb8e 100644 --- a/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/report/impl/ReportImplDefintion.java +++ b/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/report/impl/ReportImplDefintion.java @@ -1,14 +1,14 @@ /* * Copyright (c) 2012 Data Harmonisation Panel - * + * * All rights reserved. This program and the accompanying materials are made * available under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. - * + * * You should have received a copy of the GNU Lesser General Public License * along with this distribution. If not, see . - * + * * Contributors: * HUMBOLDT EU Integrated Project #030962 * Data Harmonisation Panel @@ -26,12 +26,12 @@ /** * Object definition for {@link DefaultReporter}. - * + * * @author Andreas Burchert * @partner 01 / Fraunhofer Institute for Computer Graphics Research */ @SuppressWarnings("rawtypes") -public class ReportImplDefintion extends AbstractReportDefinition> { +public class ReportImplDefintion extends AbstractReportDefinition, Reporter> { private static final ALogger _log = ALoggerFactory.getLogger(ReportImplDefintion.class); @@ -39,7 +39,7 @@ public class ReportImplDefintion extends AbstractReportDefinition>) (Class) Report.class, "default"); } /** diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/HalePlatformTest.java b/common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/HalePlatformTest.java similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/HalePlatformTest.java rename to common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/HalePlatformTest.java diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/PathUpdateTest.java b/common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/PathUpdateTest.java similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/PathUpdateTest.java rename to common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/PathUpdateTest.java diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/impl/TextTypeJsonTest.groovy b/common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/impl/TextTypeJsonTest.groovy similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/impl/TextTypeJsonTest.groovy rename to common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/impl/TextTypeJsonTest.groovy diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/impl/ValueListTypeTest.java b/common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/impl/ValueListTypeTest.java similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/impl/ValueListTypeTest.java rename to common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/impl/ValueListTypeTest.java diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/impl/ValueMapTypeTest.groovy b/common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/impl/ValueMapTypeTest.groovy similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/impl/ValueMapTypeTest.groovy rename to common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/impl/ValueMapTypeTest.groovy diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/impl/ValuePropertiesTypeTest.groovy b/common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/impl/ValuePropertiesTypeTest.groovy similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/impl/ValuePropertiesTypeTest.groovy rename to common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/impl/ValuePropertiesTypeTest.groovy diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/project/ProjectTest.java b/common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/project/ProjectTest.java similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/project/ProjectTest.java rename to common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/project/ProjectTest.java diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/project/util/XMLPathUpdaterTest.java b/common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/project/util/XMLPathUpdaterTest.java similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/project/util/XMLPathUpdaterTest.java rename to common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/project/util/XMLPathUpdaterTest.java diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/supplier/LookupStreamResourceTest.java b/common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/supplier/LookupStreamResourceTest.java similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/io/supplier/LookupStreamResourceTest.java rename to common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/supplier/LookupStreamResourceTest.java diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/report/util/StatsMergeTest.groovy b/common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/report/util/StatsMergeTest.groovy similarity index 100% rename from common/plugins/eu.esdihumboldt.hale.common.core.test/src/eu/esdihumboldt/hale/common/core/report/util/StatsMergeTest.groovy rename to common/plugins/eu.esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/report/util/StatsMergeTest.groovy diff --git a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/.classpath b/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/.classpath deleted file mode 100644 index 3628e33687..0000000000 --- a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/.project b/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/.project deleted file mode 100644 index 4dd6b8f99a..0000000000 --- a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - eu.esdihumboldt.hale.util.nonosgi - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/.settings/org.eclipse.jdt.core.prefs b/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dca..0000000000 --- a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/META-INF/MANIFEST.MF b/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/META-INF/MANIFEST.MF deleted file mode 100644 index d412a39225..0000000000 --- a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/META-INF/MANIFEST.MF +++ /dev/null @@ -1,16 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Utilities for usage in Non-OSGi environment -Bundle-SymbolicName: eu.esdihumboldt.hale.util.nonosgi -Bundle-Version: 5.4.0.qualifier -Bundle-Vendor: data harmonisation panel -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0" -Export-Package: eu.esdihumboldt.hale.util.nonosgi, - eu.esdihumboldt.hale.util.nonosgi.contenttype, - eu.esdihumboldt.hale.util.nonosgi.contenttype.describer -Import-Package: ch.qos.logback.classic;version="1.0.13";resolution:=optional, - ch.qos.logback.classic.turbo;version="1.0.13";resolution:=optional, - ch.qos.logback.core.spi;version="1.0.13";resolution:=optional, - org.slf4j;version="1.7.10" -Automatic-Module-Name: eu.esdihumboldt.hale.util.nonosgi diff --git a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/build.gradle b/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/build.gradle new file mode 100644 index 0000000000..3090638955 --- /dev/null +++ b/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/build.gradle @@ -0,0 +1,16 @@ +plugins { + id 'hale.migrated-java' +} + +hale { + bundleName = 'Utilities for usage in Non-OSGi environment' +} + +dependencies { + implementation libs.slf4j.api + + implementation libs.eclipse.core.runtime + + compileOnly libs.logback.core + compileOnly libs.logback.classic +} diff --git a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/build.properties b/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/build.properties deleted file mode 100644 index 34d2e4d2da..0000000000 --- a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.classpath b/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.classpath deleted file mode 100644 index eca7bdba8f..0000000000 --- a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.options b/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.options deleted file mode 100644 index a080d6e433..0000000000 --- a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.options +++ /dev/null @@ -1,2 +0,0 @@ -# Turn on debugging for the eclipse contexts -org.eclipse.equinox.nonosgi.registry/debug=false \ No newline at end of file diff --git a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.project b/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.project deleted file mode 100644 index bdb889b869..0000000000 --- a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.equinox.nonosgi.registry - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.settings/org.eclipse.jdt.core.prefs b/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0c68a61dca..0000000000 --- a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.settings/org.eclipse.pde.core.prefs b/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 7b4fe5951c..0000000000 --- a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -#Fri Aug 13 12:45:32 CEST 2010 -eclipse.preferences.version=1 -pluginProject.equinox=false -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/META-INF/MANIFEST.MF b/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/META-INF/MANIFEST.MF deleted file mode 100644 index f51428d6c0..0000000000 --- a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.eclipse.equinox.nonosgi.registry -Bundle-Version: 1.0.0 -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.equinox.registry;bundle-version="3.5.0" -Import-Package: org.eclipse.osgi.framework.util, - org.eclipse.osgi.service.debug;version="1.2.0", - org.osgi.framework;version="1.5.0", - org.osgi.util.tracker -Export-Package: org.eclipse.equinox.nonosgi.registry -Bundle-Localization: plugin -Bundle-ActivationPolicy: lazy -Bundle-Vendor: %Bundle-Vendor.0 -Bundle-Activator: org.eclipse.equinox.nonosgi.internal.registry.Activator -Automatic-Module-Name: org.eclipse.equinox.nonosgi.registry diff --git a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/build.gradle b/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/build.gradle new file mode 100644 index 0000000000..1330c74e60 --- /dev/null +++ b/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/build.gradle @@ -0,0 +1,15 @@ +plugins { + id 'hale.migrated-java' +} + +hale { + bundleName = 'Extension Point with NO OSGi-env.' + bundleVendor = 'Eclipse.org' + + activator = 'org.eclipse.equinox.nonosgi.internal.registry.Activator' + lazyActivation = true +} + +dependencies { + implementation libs.eclipse.equinox.registry +} diff --git a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/build.properties b/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/build.properties deleted file mode 100644 index aa1a008269..0000000000 --- a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.properties diff --git a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/plugin.properties b/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/plugin.properties deleted file mode 100644 index 19a85f1459..0000000000 --- a/ext/nonosgi/org.eclipse.equinox.nonosgi.registry/plugin.properties +++ /dev/null @@ -1,12 +0,0 @@ -#******************************************************************************* -# Copyright (c) 2010 Angelo Zerr and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# Angelo Zerr - initial API and implementation -#*******************************************************************************/ -Bundle-Vendor.0 = Eclipse.org -Bundle-Name.0 = Extension Point with NO OSGi-env. \ No newline at end of file diff --git a/ext/styledmap/COPYING b/ext/styledmap/COPYING deleted file mode 100644 index 94a9ed024d..0000000000 --- a/ext/styledmap/COPYING +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/ext/styledmap/COPYING.LESSER b/ext/styledmap/COPYING.LESSER deleted file mode 100644 index 65c5ca88a6..0000000000 --- a/ext/styledmap/COPYING.LESSER +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/ext/styledmap/de.fhg.igd.mapviewer.feature.all/.project b/ext/styledmap/de.fhg.igd.mapviewer.feature.all/.project deleted file mode 100644 index 317261770a..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.feature.all/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - de.fhg.igd.mapviewer.feature.all - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.feature.all/build.properties b/ext/styledmap/de.fhg.igd.mapviewer.feature.all/build.properties deleted file mode 100644 index 64f93a9f0b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.feature.all/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/ext/styledmap/de.fhg.igd.mapviewer.feature.all/feature.xml b/ext/styledmap/de.fhg.igd.mapviewer.feature.all/feature.xml deleted file mode 100644 index 9150faa56a..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.feature.all/feature.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - GNU Lesser General Public License, license of included dependencies may vary (see the individual plug-ins). - - - - - - - - - - - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.feature.core/.project b/ext/styledmap/de.fhg.igd.mapviewer.feature.core/.project deleted file mode 100644 index 38feaa83d9..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.feature.core/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - de.fhg.igd.mapviewer.feature.core - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.feature.core/build.properties b/ext/styledmap/de.fhg.igd.mapviewer.feature.core/build.properties deleted file mode 100644 index 64f93a9f0b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.feature.core/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/ext/styledmap/de.fhg.igd.mapviewer.feature.core/feature.xml b/ext/styledmap/de.fhg.igd.mapviewer.feature.core/feature.xml deleted file mode 100644 index 3f05d08564..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.feature.core/feature.xml +++ /dev/null @@ -1,123 +0,0 @@ - - - - - GNU Lesser General Public License, license of included dependencies may vary (see the individual plug-ins). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.classpath b/ext/styledmap/de.fhg.igd.mapviewer.server.file/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.project b/ext/styledmap/de.fhg.igd.mapviewer.server.file/.project deleted file mode 100644 index 54a8e0ead1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - de.fhg.igd.mapviewer.server.file - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/edu.umd.cs.findbugs.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 58ce6d564e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.core.resources.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index ff635dadef..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.jdt.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ab99a2ded1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,428 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.jdt.groovy.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.jdt.launching.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 706de46d84..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.jdt.ui.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index b90cfe5125..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,68 +0,0 @@ -#Updated from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com;de; -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.pde.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 6a3d7a2952..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Jul 08 10:49:51 CEST 2009 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.pde.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.server.file/META-INF/MANIFEST.MF deleted file mode 100644 index c99aae8264..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/META-INF/MANIFEST.MF +++ /dev/null @@ -1,18 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Map File -Bundle-SymbolicName: de.fhg.igd.mapviewer.server.file;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-Vendor: Fraunhofer IGD -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: de.fhg.igd.eclipse.ui.util.extension, - de.fhg.igd.eclipse.util.extension, - de.fhg.igd.mapviewer.server;version="1.0.0", - org.apache.commons.logging;version="1.1.1", - org.eclipse.swt, - org.eclipse.swt.widgets, - org.jdesktop.swingx.mapviewer;version="1.0.0", - org.jdesktop.swingx.painter -Export-Package: de.fhg.igd.mapviewer.server.file;version="1.0.0" -Require-Bundle: org.eclipse.ui.workbench;bundle-version="3.5.0" -Automatic-Module-Name: de.fhg.igd.mapviewer.server.file diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/build.properties b/ext/styledmap/de.fhg.igd.mapviewer.server.file/build.properties deleted file mode 100644 index e9863e281e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/plugin.xml b/ext/styledmap/de.fhg.igd.mapviewer.server.file/plugin.xml deleted file mode 100644 index cf941b3157..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/plugin.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/FileTiler.java b/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/FileTiler.java deleted file mode 100644 index b5f43ad210..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/FileTiler.java +++ /dev/null @@ -1,736 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.file; - -import java.awt.Dimension; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; -import java.util.jar.JarEntry; -import java.util.jar.JarOutputStream; -import java.util.jar.Manifest; -import java.util.prefs.Preferences; - -import javax.swing.JFileChooser; -import javax.swing.JOptionPane; -import javax.swing.filechooser.FileFilter; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * FileTiler - creates map files - * - * @author Simon Templer - * - * @version $Id$ - */ -public class FileTiler { - - /** - * A file filter that accepts file names that contain a certain string - */ - public static class ContainsFileFilter extends FileFilter { - - private final String contains; - - /** - * Creates a file filter that accepts file names that contain the given - * string - * - * @param contains the string that must be contained in accepted file - * names - */ - public ContainsFileFilter(String contains) { - this.contains = contains; - } - - /** - * @see FileFilter#accept(File) - */ - @Override - public boolean accept(File f) { - if (f.isDirectory()) - return true; - else - return f.getName().indexOf(contains) >= 0; - } - - /** - * @see FileFilter#getDescription() - */ - @Override - public String getDescription() { - return contains + " file"; - } - - } - - /** - * A file filter that accepts a certain file name - */ - public static class ExactFileFilter extends FileFilter { - - private final String fileName; - - /** - * Creates a file filter that accepts the given file name - * - * @param fileName the file name - */ - public ExactFileFilter(String fileName) { - this.fileName = fileName; - } - - /** - * @see FileFilter#accept(java.io.File) - */ - @Override - public boolean accept(File f) { - if (f.isDirectory()) - return true; - else - return f.getName().equals(fileName); - } - - /** - * @see FileFilter#getDescription() - */ - @Override - public String getDescription() { - return fileName; - } - - } - - private static final Log log = LogFactory.getLog(FileTiler.class); - - // preferences keys - private static final String PREF_DIR = "dir"; - private static final String PREF_CONVERT = "convert"; - private static final String PREF_IDENTIFY = "identify"; - - // default values - private static final int DEF_MIN_TILE_SIZE = 200; - private static final int DEF_MIN_MAP_SIZE = 600; - - // map properties keys - /** tile width (pixel) property name */ - public static final String PROP_TILE_WIDTH = "tileWidth"; - /** tile height (pixel) property name */ - public static final String PROP_TILE_HEIGHT = "tileHeight"; - /** number of zoom levels property name */ - public static final String PROP_ZOOM_LEVELS = "zoomLevels"; - /** map width (tiles) property name */ - public static final String PROP_MAP_WIDTH = "mapWidthAtZoom"; - /** map height (tiles) property name */ - public static final String PROP_MAP_HEIGHT = "mapHeightAtZoom"; - - /** map properties file name */ - public static final String MAP_PROPERTIES_FILE = "map.properties"; - /** map file file-extension */ - public static final String MAP_ARCHIVE_EXTENSION = ".map"; - /** converter properties file name */ - public static final String CONVERTER_PROPERTIES_FILE = "converter.properties"; - - // tile file - /** tile file name prefix */ - public static final String TILE_FILE_PREFIX = "tile_z"; - /** tile file name separator */ - public static final String TILE_FILE_SEPARATOR = "_n"; - /** tile file file-extension */ - public static final String TILE_FILE_EXTENSION = ".jpg"; - - /** - * Buffer size for writing files into jar archive - */ - public static int BUFFER_SIZE = 10240; - - /** - * FileTiler preferences node - */ - private final Preferences pref = Preferences.userNodeForPackage(FileTiler.class) - .node(FileTiler.class.getSimpleName()); - - /** - * Path to convert executable - */ - private String convertPath; - - /** - * Path to identify executable - */ - private String identifyPath; - - /** - * Get the path to the convert executable - * - * @return the path to the convert executable - */ - private String getConvertPath() { - if (convertPath == null) - loadCommandPaths(); - - return convertPath; - } - - /** - * Get the path to the identify executable - * - * @return the path to the convert executable - */ - private String getIdentifyPath() { - if (identifyPath == null) - loadCommandPaths(); - - return identifyPath; - } - - /** - * Load the command paths from the preferences or ask the user for them - */ - private void loadCommandPaths() { - String convert = pref.get(PREF_CONVERT, null); - String identify = pref.get(PREF_IDENTIFY, null); - - JFileChooser commandChooser = new JFileChooser(); - - if (convert != null && identify != null) { - if (JOptionPane.showConfirmDialog(null, - "Found paths to executables:
" + convert + "
" + identify - + "
Do you want to use this settings?", - "Paths to executables", JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE) == JOptionPane.NO_OPTION) { - convert = null; - identify = null; - } - } - - if (convert == null) { - // ask for convert path - convert = askForPath(commandChooser, new ContainsFileFilter("convert"), - "Please select your convert executable"); - } - - if (convert != null && identify == null) { - // ask for identify path - identify = askForPath(commandChooser, new ContainsFileFilter("identify"), - "Please select your identify executable"); - } - - if (convert == null) - pref.remove(PREF_CONVERT); - else - pref.put(PREF_CONVERT, convert); - - if (identify == null) - pref.remove(PREF_IDENTIFY); - else - pref.put(PREF_IDENTIFY, identify); - - convertPath = convert; - identifyPath = identify; - } - - /** - * Ask the user for a certain file path - * - * @param chooser the {@link JFileChooser} to use - * @param filter the file filter - * @param title the title of the dialog - * - * @return the selected file or null - */ - private String askForPath(JFileChooser chooser, FileFilter filter, String title) { - chooser.setDialogTitle(title); - chooser.setFileFilter(filter); - int returnVal = chooser.showOpenDialog(null); - if (returnVal == JFileChooser.APPROVE_OPTION) { - return chooser.getSelectedFile().getAbsolutePath(); - } - - return null; - } - - /** - * Uses a Runtime.exec() to use imagemagick to perform the given conversion - * operation. Returns true on success, false on failure. Does not check if - * either file exists. - * - * @param in Description of the Parameter - * @param out Description of the Parameter - * @param width the new width - * @param height the new height - * @param quality Description of the Parameter - * @return Description of the Return Value - */ - public boolean convert(File in, File out, int width, int height, int quality) { - if (quality < 0 || quality > 100) { - quality = 75; - } - - // note: CONVERT_PROG is a class variable that stores the location of - // ImageMagick's convert command - // it might be something like "/usr/local/magick/bin/convert" or - // something else, depending on where you installed it. - String[] command = { getConvertPath(), "-geometry", width + "x" + height, "-quality", - String.valueOf(quality), in.getAbsolutePath(), out.getAbsolutePath() }; - - return exec(command, null); - } - - /** - * Split an image file into tiles - * - * @param in the image file - * @param outPattern the name pattern for the tiles (e.g. tiles_%d) - * @param extension the file extension for the tile image files - * @param tileWidth the desired tile width - * @param tileHeight the desired tile height - * - * @return if the operation succeded - */ - public boolean tile(File in, String outPattern, String extension, int tileWidth, - int tileHeight) { - File dir = in.getParentFile(); - - String[] command = { getConvertPath(), in.getAbsolutePath(), "-crop", - tileWidth + "x" + tileHeight, "+repage", - dir.getAbsolutePath() + File.separator + outPattern + extension }; - - return exec(command, null); - } - - /** - * Get the size of an image using the identify command - * - * @param imageFile the image file - * - * @return the dimension stating the size of the image or null - */ - public Dimension getSize(File imageFile) { - String[] command = { getIdentifyPath(), imageFile.getAbsolutePath() }; - - List result = new ArrayList(); - boolean success = exec(command, result); - - if (success && !result.isEmpty()) { - try { - String[] split = result.get(0).split(" "); - String name = imageFile.getName(); - log.info("Filename: " + name); - boolean found = false; - int fileIndex; - for (fileIndex = 0; !found && fileIndex < split.length; fileIndex++) { - if (split[fileIndex].endsWith(name)) - found = true; - } - - if (found) { - String geometry = split[fileIndex + 1]; // get geometry part - String[] geosplit = geometry.split("x"); - return new Dimension(Integer.parseInt(geosplit[0]), - Integer.parseInt(geosplit[1])); - } - else - throw new IllegalArgumentException(); - } catch (Exception e) { - log.error("Error getting size info for file " + imageFile.getAbsolutePath() - + ", output was: " + result); - } - } - - return null; - } - - /** - * Tries to exec the command, waits for it to finsih, logs errors if exit - * status is nonzero, and returns true if exit status is 0 (success). - * - * @param command Description of the Parameter - * @param output a list that will be cleared and the output lines added (if - * the list is not null) - * @return Description of the Return Value - */ - public static boolean exec(String[] command, List output) { - Process proc; - - try { - // System.out.println("Trying to execute command " + - // Arrays.asList(command)); - proc = Runtime.getRuntime().exec(command); - } catch (IOException e) { - log.error("IOException while trying to execute " + Arrays.toString(command), e); - return false; - } - - if (output == null) - output = new ArrayList(); - - output.clear(); - BufferedReader reader = new BufferedReader(new InputStreamReader(proc.getInputStream())); - - String currentLine; - try { - while ((currentLine = reader.readLine()) != null) { - output.add(currentLine); - } - } catch (IOException e) { - log.error("Error reading process output", e); - } finally { - try { - reader.close(); - } catch (IOException e) { - log.error("Error closing input stream", e); - } - } - - int exitStatus; - - while (true) { - try { - exitStatus = proc.waitFor(); - break; - } catch (java.lang.InterruptedException e) { - log.warn("Interrupted: Ignoring and waiting"); - } - } - - if (exitStatus != 0) { - /* - * StringBuilder cmdString = new StringBuilder(); for (int i = 0; i - * < command.length; i++) cmdString.append(command[i]); - */ - log.warn("Error executing command: " + exitStatus + " (" + output + ")"); - } - - return (exitStatus == 0); - } - - /** - * Ask the user for an image file for that a tiled map shall be created - */ - public void run() { - JFileChooser fileChooser = new JFileChooser(); - - // load current dir - fileChooser.setCurrentDirectory( - new File(pref.get(PREF_DIR, fileChooser.getCurrentDirectory().getAbsolutePath()))); - - // open - int returnVal = fileChooser.showOpenDialog(null); - if (returnVal == JFileChooser.APPROVE_OPTION) { - // save current dir - pref.put(PREF_DIR, fileChooser.getCurrentDirectory().getAbsolutePath()); - - // get file - File imageFile = fileChooser.getSelectedFile(); - - // get image dimension - Dimension size = getSize(imageFile); - log.info("Image size: " + size); - - // ask for min tile size - int minTileSize = 0; - while (minTileSize <= 0) { - try { - minTileSize = Integer.parseInt(JOptionPane.showInputDialog("Minimal tile size", - String.valueOf(DEF_MIN_TILE_SIZE))); - } catch (Exception e) { - minTileSize = 0; - } - } - - // determine min map width - int width = size.width; - - while (width / 2 > minTileSize && width % 2 == 0) { - width = width / 2; - } - int minMapWidth = width; // min map width - - log.info("Minimal map width: " + minMapWidth); - - // determine min map height - int height = size.height; - - while (height / 2 > minTileSize && height % 2 == 0) { - height = height / 2; // min map height - } - int minMapHeight = height; - - log.info("Minimal map height: " + minMapHeight); - - // ask for min map size - int minMapSize = 0; - while (minMapSize <= 0) { - try { - minMapSize = Integer.parseInt(JOptionPane.showInputDialog("Minimal map size", - String.valueOf(DEF_MIN_MAP_SIZE))); - } catch (Exception e) { - minMapSize = 0; - } - } - - // determine zoom levels - int zoomLevels = 1; - - width = size.width; - height = size.height; - - while (width % 2 == 0 && height % 2 == 0 - && width / 2 >= Math.max(minMapWidth, minMapSize) - && height / 2 >= Math.max(minMapHeight, minMapSize)) { - zoomLevels++; - width = width / 2; - height = height / 2; - } - - log.info("Number of zoom levels: " + zoomLevels); - - // determine tile width - width = minMapWidth; - int tileWidth = minMapWidth; - for (int i = 3; i < Math.sqrt(minMapWidth) && width > minTileSize;) { - tileWidth = width; - if (width % i == 0) { - width = width / i; - } - else - i++; - } - - // determine tile height - height = minMapHeight; - int tileHeight = minMapHeight; - for (int i = 3; i < Math.sqrt(minMapHeight) && height > minTileSize;) { - tileHeight = height; - if (height % i == 0) { - height = height / i; - } - else - i++; - } - - // create tiles for each zoom level - if (JOptionPane.showConfirmDialog(null, - "Create tiles (" + tileWidth + "x" + tileHeight + ") for " + zoomLevels - + " zoom levels?", - "Create tiles", JOptionPane.YES_NO_OPTION, - JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) { - int currentWidth = size.width; - int currentHeight = size.height; - File currentImage = imageFile; - - Properties properties = new Properties(); - properties.setProperty(PROP_TILE_WIDTH, String.valueOf(tileWidth)); - properties.setProperty(PROP_TILE_HEIGHT, String.valueOf(tileHeight)); - properties.setProperty(PROP_ZOOM_LEVELS, String.valueOf(zoomLevels)); - - List files = new ArrayList(); - - for (int i = 0; i < zoomLevels; i++) { - int mapWidth = currentWidth / tileWidth; - int mapHeight = currentHeight / tileHeight; - - log.info("Creating tiles for zoom level " + i); - log.info("Map width: " + currentWidth + " pixels, " + mapWidth + " tiles"); - log.info("Map height: " + currentHeight + " pixels, " + mapHeight + " tiles"); - - // create tiles - tile(currentImage, TILE_FILE_PREFIX + i + TILE_FILE_SEPARATOR + "%d", - TILE_FILE_EXTENSION, tileWidth, tileHeight); - - // add files to list - for (int num = 0; num < mapWidth * mapHeight; num++) { - files.add(new File(imageFile.getParentFile().getAbsolutePath() - + File.separator + TILE_FILE_PREFIX + i + TILE_FILE_SEPARATOR + num - + TILE_FILE_EXTENSION)); - } - - // store map width and height at current zoom - properties.setProperty(PROP_MAP_WIDTH + i, String.valueOf(mapWidth)); - properties.setProperty(PROP_MAP_HEIGHT + i, String.valueOf(mapHeight)); - - // create image for next zoom level - currentWidth /= 2; - currentHeight /= 2; - // create temp image file name - File nextImage = suffixFile(imageFile, i + 1); - // resize image - convert(currentImage, nextImage, currentWidth, currentHeight, 100); - // delete previous temp file - if (!currentImage.equals(imageFile)) { - if (!currentImage.delete()) { - log.warn("Error deleting " + imageFile.getAbsolutePath()); - } - } - - currentImage = nextImage; - } - - // delete previous temp file - if (!currentImage.equals(imageFile)) { - if (!currentImage.delete()) { - log.warn("Error deleting " + imageFile.getAbsolutePath()); - } - } - - // write properties file - File propertiesFile = new File(imageFile.getParentFile().getAbsolutePath() - + File.separator + MAP_PROPERTIES_FILE); - try { - FileWriter propertiesWriter = new FileWriter(propertiesFile); - try { - properties.store(propertiesWriter, - "Map generated from " + imageFile.getName()); - // add properties file to list - files.add(propertiesFile); - } finally { - propertiesWriter.close(); - } - } catch (IOException e) { - log.error("Error writing map properties file", e); - } - - // add a converter properties file - String convProperties = askForPath(fileChooser, - new ExactFileFilter(CONVERTER_PROPERTIES_FILE), - "Select a converter properties file"); - File convFile = null; - if (convProperties != null) { - convFile = new File(convProperties); - files.add(convFile); - } - - // create jar file - log.info("Creating jar archive..."); - if (createJarArchive(replaceExtension(imageFile, MAP_ARCHIVE_EXTENSION), files)) { - log.info("Archive successfully created, deleting tiles..."); - // don't delete converter properties - if (convFile != null) - files.remove(files.size() - 1); - // delete files - for (File file : files) { - if (!file.delete()) { - log.warn("Error deleting " + file.getAbsolutePath()); - } - } - } - - log.info("Fin."); - } - } - } - - /** - * Inserts an integer suffix after the file name of the given file, just - * before the extension and returns the file object with the modified file - * name - * - * @param file the base file name - * @param suffix the suffix that shall be inserted - * - * @return the file object with the modified file name - */ - private File suffixFile(File file, int suffix) { - String fileName = file.getAbsolutePath(); - int index = fileName.lastIndexOf('.'); - String newName = fileName.substring(0, index) + String.valueOf(suffix) - + fileName.substring(index); - return new File(newName); - } - - /** - * Returns a file object that equals the given file except for the file - * extension - * - * @param file the file - * @param extension the new extension (with leading dot) - * - * @return the file object with the modified file name - */ - private File replaceExtension(File file, String extension) { - String fileName = file.getAbsolutePath(); - int index = fileName.lastIndexOf('.'); - String newName = fileName.substring(0, index) + extension; - return new File(newName); - } - - /** - * Creates a Jar archive that includes the given list of files - * - * @param archiveFile the name of the jar archive file - * @param tobeJared the files to be included in the jar file - * - * @return if the operation was successful - */ - public static boolean createJarArchive(File archiveFile, List tobeJared) { - try { - byte buffer[] = new byte[BUFFER_SIZE]; - // Open archive file - FileOutputStream stream = new FileOutputStream(archiveFile); - JarOutputStream out = new JarOutputStream(stream, new Manifest()); - - for (int i = 0; i < tobeJared.size(); i++) { - if (tobeJared.get(i) == null || !tobeJared.get(i).exists() - || tobeJared.get(i).isDirectory()) - continue; // Just in case... - log.debug("Adding " + tobeJared.get(i).getName()); - - // Add archive entry - JarEntry jarAdd = new JarEntry(tobeJared.get(i).getName()); - jarAdd.setTime(tobeJared.get(i).lastModified()); - out.putNextEntry(jarAdd); - - // Write file to archive - FileInputStream in = new FileInputStream(tobeJared.get(i)); - while (true) { - int nRead = in.read(buffer, 0, buffer.length); - if (nRead <= 0) - break; - out.write(buffer, 0, nRead); - } - in.close(); - } - - out.close(); - stream.close(); - log.info("Adding completed OK"); - return true; - } catch (Exception e) { - log.error("Creating jar file failed", e); - return false; - } - } - - /** - * Executes a FileTiler instance - * - * @param args ignored - */ - public static void main(String[] args) { - new FileTiler().run(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/MapFileServerFactory.java b/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/MapFileServerFactory.java deleted file mode 100644 index 7e03179d8f..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/MapFileServerFactory.java +++ /dev/null @@ -1,286 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.file; - -import java.io.File; -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.prefs.BackingStoreException; -import java.util.prefs.Preferences; - -import javax.swing.JFileChooser; -import javax.swing.filechooser.FileNameExtensionFilter; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.FileDialog; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.mapviewer.TileProvider; - -import de.fhg.igd.eclipse.util.extension.AbstractObjectFactory; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection; -import de.fhg.igd.mapviewer.server.MapServer; -import de.fhg.igd.mapviewer.server.MapServerFactory; -import de.fhg.igd.mapviewer.server.MapServerFactoryCollection; -import de.fhg.igd.mapviewer.server.TileProviderMapServer; - -/** - * MapFileServerFactory - * - * @author Simon Templer - * - * @version $Id$ - */ -public class MapFileServerFactory implements MapServerFactoryCollection { - - /** - * Map file server factory - */ - public class MapFileServer extends AbstractObjectFactoryimplements MapServerFactory { - - private final String name; - - /** - * Constructor - * - * @param name the map name - */ - public MapFileServer(String name) { - super(); - - this.name = name; - } - - /** - * @see ExtensionObjectFactory#createExtensionObject() - */ - @Override - public MapServer createExtensionObject() throws Exception { - return loadServer(name); - } - - /** - * @see ExtensionObjectDefinition#getDisplayName() - */ - @Override - public String getDisplayName() { - return name; - } - - /** - * @see ExtensionObjectDefinition#getIdentifier() - */ - @Override - public String getIdentifier() { - return getTypeName() + ":" + getDisplayName(); //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectDefinition#getTypeName() - */ - @Override - public String getTypeName() { - return MapFileServerFactory.class.getName(); - } - - /** - * @see ExtensionObjectFactory#dispose(Object) - */ - @Override - public void dispose(MapServer instance) { - instance.cleanup(); - } - - } - - private static final Log log = LogFactory.getLog(MapFileServerFactory.class); - - private static final String NODE_MAP_FILES = "mapFiles"; //$NON-NLS-1$ - - private final Map prefServers = new HashMap(); - - private final Preferences mapFiles = Preferences.userNodeForPackage(MapFileServerFactory.class) - .node(MapFileServerFactory.class.getSimpleName()).node(NODE_MAP_FILES); - - private final JFileChooser fileChooser = new JFileChooser(); - - /** - * Default constructor - */ - public MapFileServerFactory() { - fileChooser.setFileFilter( - new FileNameExtensionFilter(Messages.getString("MapFileServerFactory.1"), //$NON-NLS-1$ - FileTiler.MAP_ARCHIVE_EXTENSION.substring(1))); - } - - /** - * @see ExtensionObjectFactoryCollection#getFactories() - */ - @Override - public List getFactories() { - List results = new LinkedList(); - - // load stored map files - try { - for (String name : mapFiles.keys()) { - results.add(new MapFileServer(name)); - } - } catch (BackingStoreException e) { - log.error("Error loading preferences", e); - } - - return results; - } - - /** - * Load a map file server with the given name - * - * @param name the server name - * @return the map server or null - */ - private MapServer loadServer(String name) { - String filename = mapFiles.get(name, null); - if (filename == null) { - mapFiles.remove(name); - } - else { - File file = new File(filename); - if (file.exists()) { - TileProvider tp; - try { - tp = MapFileTileProvider.createMapFileTileProvider(file); - MapServer server = new TileProviderMapServer(tp); - server.setName(name); - prefServers.put(server, name); - return server; - } catch (MalformedURLException e) { - log.error("Invalid file name", e); - } catch (IOException e) { - log.error("Error loading map file", e); - } - } - else { - log.info("Map file not found, removing map: " + filename); - } - } - - return null; - } - - /** - * Create a new server and add it to the collection - * - * @return the new server or null - */ - private MapServer createNewServer() { - Shell shell = PlatformUI.getWorkbench().getDisplay().getActiveShell(); - FileDialog dialog = new FileDialog(shell, SWT.OPEN); - - dialog.setFilterNames(new String[] { Messages.getString("MapFileServerFactory.6") }); //$NON-NLS-1$ - dialog.setFilterExtensions(new String[] { "*.map" }); //$NON-NLS-1$ - - String openName = dialog.open(); - if (openName != null) { - File file = new File(openName); - - // XXX if (fileChooser.showOpenDialog(null) == - // JFileChooser.APPROVE_OPTION) { - // XXX File file = fileChooser.getSelectedFile(); - - if (file.exists()) { - String name = file.getName(); - - int i = 1; - while (mapFiles.get(name, null) != null) { - name = file.getName() + "_" + i; //$NON-NLS-1$ - i++; - } - - mapFiles.put(name, file.getAbsolutePath()); - - return loadServer(name); - } - } - - return null; - } - - /** - * @see ExtensionObjectFactoryCollection#addNew() - */ - @Override - public MapServerFactory addNew() { - MapServer server = createNewServer(); - if (server != null) { - return new MapFileServer(server.getName()); - } - else { - return null; - } - } - - /** - * @see ExtensionObjectFactoryCollection#allowAddNew() - */ - @Override - public boolean allowAddNew() { - return true; - } - - /** - * @see ExtensionObjectFactoryCollection#allowRemove() - */ - @Override - public boolean allowRemove() { - return true; - } - - /** - * @see ExtensionObjectFactoryCollection#remove(ExtensionObjectFactory) - */ - @Override - public boolean remove(MapServerFactory factory) { - removeServer(factory.getDisplayName()); - return true; - } - - /** - * Remove the server with the given name - * - * @param name the name - */ - private void removeServer(String name) { - if (name != null) { - mapFiles.remove(name); - } - } - - /** - * @see ExtensionObjectFactoryCollection#getName() - */ - @Override - public String getName() { - return Messages.getString("MapFileServerFactory.8"); //$NON-NLS-1$ - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/MapFileTileProvider.java b/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/MapFileTileProvider.java deleted file mode 100644 index 51059c6516..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/MapFileTileProvider.java +++ /dev/null @@ -1,193 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.file; - -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.MalformedURLException; -import java.net.URI; -import java.util.Properties; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.mapviewer.AbstractTileProvider; -import org.jdesktop.swingx.mapviewer.BasicTileProvider; -import org.jdesktop.swingx.mapviewer.PixelConverter; -import org.jdesktop.swingx.mapviewer.TileProvider; - -/** - * TileProvider based on a map file created by {@link FileTiler} - * - * @author Simon Templer - * - * @version $Id$ - */ -public class MapFileTileProvider extends BasicTileProvider { - - private static final Log log = LogFactory.getLog(MapFileTileProvider.class); - - private final Properties converterProperties; - - private final File mapFile; - - private final int[] mapWidth; - private final int[] mapHeight; - - /** - * Creates a {@link MapFileTileProvider} - * - * @param mapFile the map file - * - * @return the {@link TileProvider} for the given map file - * - * @throws IOException if the map file cannot be read - * @throws MalformedURLException if an URI for a map file entry is invalid - */ - public static MapFileTileProvider createMapFileTileProvider(File mapFile) - throws MalformedURLException, IOException { - Properties mapProperties = new Properties(); - InputStreamReader mapReader = new InputStreamReader( - getEntryURI(mapFile, FileTiler.MAP_PROPERTIES_FILE).toURL().openStream()); - try { - mapProperties.load(mapReader); - } finally { - mapReader.close(); - } - - Properties converterProperties = new Properties(); - InputStreamReader converterReader = new InputStreamReader( - getEntryURI(mapFile, FileTiler.CONVERTER_PROPERTIES_FILE).toURL().openStream()); - try { - converterProperties.load(converterReader); - } finally { - converterReader.close(); - } - - // get informations from map properties - int zoomLevels = Integer.parseInt(mapProperties.getProperty(FileTiler.PROP_ZOOM_LEVELS)); - - int[] mapWidth = new int[zoomLevels]; - int[] mapHeight = new int[zoomLevels]; - - for (int zoom = 0; zoom < zoomLevels; zoom++) { - mapWidth[zoom] = Integer - .parseInt(mapProperties.getProperty(FileTiler.PROP_MAP_WIDTH + zoom)); - mapHeight[zoom] = Integer - .parseInt(mapProperties.getProperty(FileTiler.PROP_MAP_HEIGHT + zoom)); - } - - int tileWidth = Integer.parseInt(mapProperties.getProperty(FileTiler.PROP_TILE_WIDTH)); - int tileHeight = Integer.parseInt(mapProperties.getProperty(FileTiler.PROP_TILE_HEIGHT)); - - return new MapFileTileProvider(mapFile, // map file - converterProperties, // converter properties - mapWidth, // map width array - mapHeight, // map height array - zoomLevels - 1, // default zoom - 0, // minimum zoom - zoomLevels - 1, // maximum zoom - zoomLevels - 1, // total map zoom - tileWidth, // tile width - tileHeight // tile height - ); - } - - /** - * Creates an URI for an entry in the given jar file - * - * @param jarFile the jar file - * @param entryName the entry name - * - * @return the {@link URI} representing the entry - * @throws MalformedURLException if the given file provides no valid url - */ - public static URI getEntryURI(File jarFile, String entryName) throws MalformedURLException { - return URI.create("jar:" + jarFile.toURI().toURL().toString() + "!/" + entryName); //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * Constructor - * - * @param mapFile the map file - * @param converterProperties the converter properties - * @param mapWidth the map width - * @param mapHeight the map height - * @param defaultZoom the default zoom - * @param minimumZoom the minimum zoom - * @param maximumZoom the maximum zoom - * @param totalMapZoom the total map zoom - * @param tileWidth the tile width - * @param tileHeight the tile height - */ - public MapFileTileProvider(File mapFile, Properties converterProperties, int[] mapWidth, - int[] mapHeight, int defaultZoom, int minimumZoom, int maximumZoom, int totalMapZoom, - int tileWidth, int tileHeight) { - super(defaultZoom, minimumZoom, maximumZoom, totalMapZoom, tileWidth, tileHeight); - - this.converterProperties = converterProperties; - this.mapFile = mapFile; - this.mapHeight = mapHeight; - this.mapWidth = mapWidth; - } - - /** - * @see AbstractTileProvider#createConverter() - */ - @Override - protected PixelConverter createConverter() { - return PropertiesConverterFactory.createConverter(converterProperties, this); - } - - /** - * @see TileProvider#getMapHeightInTiles(int) - */ - @Override - public int getMapHeightInTiles(int zoom) { - if (zoom < mapHeight.length) - return mapHeight[zoom]; - else - return 1; // FIXME - } - - /** - * @see TileProvider#getMapWidthInTiles(int) - */ - @Override - public int getMapWidthInTiles(int zoom) { - if (zoom < mapWidth.length) - return mapWidth[zoom]; - else - return 1; // FIXME - } - - /** - * @see TileProvider#getTileUris(int, int, int) - */ - @Override - public URI[] getTileUris(int x, int y, int zoom) { - try { - URI r = getEntryURI(mapFile, - FileTiler.TILE_FILE_PREFIX + zoom + FileTiler.TILE_FILE_SEPARATOR - + String.valueOf(x + y * getMapWidthInTiles(zoom)) - + FileTiler.TILE_FILE_EXTENSION); - return new URI[] { r }; - } catch (MalformedURLException e) { - log.error("Error creating tile uri", e); //$NON-NLS-1$ - return null; - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/Messages.java b/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/Messages.java deleted file mode 100644 index 9fdd9b2fc9..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/Messages.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.file; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -/** - * File map messages. - * - * @author Simon Templer - */ -@SuppressWarnings("all") -public class Messages { - - private static final String BUNDLE_NAME = "de.fhg.igd.mapviewer.server.file.messages"; //$NON-NLS-1$ - - private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME); - - private Messages() { - } - - /** - * Get a message - * - * @param key the message key - * @return the message - */ - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/PropertiesConverterFactory.java b/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/PropertiesConverterFactory.java deleted file mode 100644 index ef2c61d9e2..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/PropertiesConverterFactory.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.file; - -import java.lang.reflect.Constructor; -import java.util.Properties; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.mapviewer.PixelConverter; -import org.jdesktop.swingx.mapviewer.TileProvider; - -/** - * Factory for {@link PixelConverter} that can be configured with a - * {@link Properties} object - * - * @author Simon Templer - * - * @version $Id$ - */ -public abstract class PropertiesConverterFactory { - - private static final Log log = LogFactory.getLog(PropertiesConverterFactory.class); - - /** converter class property name */ - public static final String PROP_CONVERTER_CLASS = "converterClass"; //$NON-NLS-1$ - - /** - * Creates a {@link PixelConverter} for the given {@link TileProvider} from - * the given properties - * - * @param properties the properties that specify the {@link PixelConverter} - * @param tileProvider the {@link TileProvider} for to be associated with - * the {@link PixelConverter} - * - * @return a {@link PixelConverter} or null if the properties didn't specify - * a valid converter - */ - @SuppressWarnings("unchecked") - public static PixelConverter createConverter(Properties properties, TileProvider tileProvider) { - String className = properties.getProperty(PROP_CONVERTER_CLASS); - - if (className == null) { - log.error("Didn't find " + PROP_CONVERTER_CLASS + " property"); //$NON-NLS-1$ //$NON-NLS-2$ - return null; - } - else { - Class converterClass; - try { - converterClass = Class.forName(className); - - Constructor constructor; - - // try Properties/TileProvider constructor - try { - constructor = (Constructor) converterClass - .getConstructor(Properties.class, TileProvider.class); - log.info( - "Found converter constructor with Properties and TileProvider arguments"); //$NON-NLS-1$ - return constructor.newInstance(properties, tileProvider); - } catch (Throwable e) { - // ignoring - } - - // try TileProvider/Properties constructor - try { - constructor = (Constructor) converterClass - .getConstructor(TileProvider.class, Properties.class); - log.info( - "Found converter constructor with TileProvider and Properties arguments"); //$NON-NLS-1$ - return constructor.newInstance(tileProvider, properties); - } catch (Throwable e) { - // ignoring - } - - // try Properties constructor - try { - constructor = (Constructor) converterClass - .getConstructor(Properties.class); - log.info("Found converter constructor with Properties argument"); //$NON-NLS-1$ - return constructor.newInstance(properties); - } catch (Throwable e) { - // ignoring - } - - // try TileProvider constructor - try { - constructor = (Constructor) converterClass - .getConstructor(TileProvider.class); - log.info("Found converter constructor with TileProvider argument"); //$NON-NLS-1$ - return constructor.newInstance(tileProvider); - } catch (Throwable e) { - // ignoring - } - - // try Default constructor - try { - constructor = (Constructor) converterClass - .getConstructor(); - log.info("Found converter default constructor"); //$NON-NLS-1$ - return constructor.newInstance(); - } catch (Throwable e) { - // ignoring - } - - log.warn("Found no supported constructor: " + className); //$NON-NLS-1$ - } catch (ClassNotFoundException e) { - log.error("Converter class not found", e); //$NON-NLS-1$ - } - } - - return null; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/messages.properties b/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/messages.properties deleted file mode 100644 index cb0c079b24..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/messages.properties +++ /dev/null @@ -1,3 +0,0 @@ -MapFileServerFactory.1=Map file -MapFileServerFactory.6=Map files -MapFileServerFactory.8=Map files diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/messages_de.properties b/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/messages_de.properties deleted file mode 100644 index b4e87c023d..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/src/de/fhg/igd/mapviewer/server/file/messages_de.properties +++ /dev/null @@ -1,3 +0,0 @@ -MapFileServerFactory.1=Kartendatei -MapFileServerFactory.6=Kartendateien -MapFileServerFactory.8=Kartendateien diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.classpath b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.project b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.project deleted file mode 100644 index 12225b42a5..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - de.fhg.igd.mapviewer.server.openstreetmap - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/edu.umd.cs.findbugs.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 58ce6d564e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.core.resources.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index ff635dadef..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.jdt.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ab99a2ded1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,428 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.jdt.groovy.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.jdt.launching.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 706de46d84..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.jdt.ui.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index b90cfe5125..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,68 +0,0 @@ -#Updated from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com;de; -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.pde.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 0e220a35f2..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Jul 08 11:12:49 CEST 2009 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.pde.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 0609ce4e70..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:37 PM -#Wed Jul 25 13:58:37 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/META-INF/MANIFEST.MF deleted file mode 100644 index 965a9acec4..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: OpenStreetMap Map Server -Bundle-SymbolicName: de.fhg.igd.mapviewer.server.openstreetmap;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-Vendor: Fraunhofer IGD -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: de.fhg.igd.mapviewer;version="1.0.0", - de.fhg.igd.mapviewer.painter, - de.fhg.igd.mapviewer.server;version="1.0.0", - org.jdesktop.swingx, - org.jdesktop.swingx.mapviewer, - org.jdesktop.swingx.painter -Export-Package: de.fhg.igd.mapviewer.server.openstreetmap;version="1.0.0" -Automatic-Module-Name: de.fhg.igd.mapviewer.server.openstreetmap diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/about.html b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/about.html deleted file mode 100644 index 312da26ae2..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/about.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - -About - - -

About OpenStreeMap Plug-in

- -

Copyright © 2009 Fraunhofer Institute for Computer Graphics Research IGD

- -

This plugin uses content provided by OpenStreetMap:
-http://www.openstreetmap.org

- -

The content has been published under the -Creative Commons Attribution-ShareAlike 2.0 -license.

- - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/build.properties b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/build.properties deleted file mode 100644 index 786b1df936..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - about.html diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/plugin.xml b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/plugin.xml deleted file mode 100644 index 56aebf73a1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/plugin.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/src/de/fhg/igd/mapviewer/server/openstreetmap/OpenStreetMapServer.java b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/src/de/fhg/igd/mapviewer/server/openstreetmap/OpenStreetMapServer.java deleted file mode 100644 index 9bd7d4bb70..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/src/de/fhg/igd/mapviewer/server/openstreetmap/OpenStreetMapServer.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.openstreetmap; - -import java.awt.Color; -import java.awt.Graphics2D; - -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileFactory; -import org.jdesktop.swingx.mapviewer.TileFactoryInfo; -import org.jdesktop.swingx.mapviewer.TileFactoryInfoTileProvider; - -import de.fhg.igd.mapviewer.MapPainter; -import de.fhg.igd.mapviewer.painter.TextPainter; -import de.fhg.igd.mapviewer.server.AbstractMapServer; -import de.fhg.igd.mapviewer.server.CustomTileFactory; -import de.fhg.igd.mapviewer.server.MapServer; - -/** - * OpenStreetMapServer - * - * @author Simon Templer - * @deprecated The Mapquest OSM tiles are no longer available, use the - * configurable custom tile maps instead. - */ -@Deprecated -public class OpenStreetMapServer extends AbstractMapServer { - - private CustomTileFactory fact; - - /** - * @see MapServer#getTileFactory(TileCache) - */ - @Override - public TileFactory getTileFactory(TileCache cache) { - final int max = 18; - TileFactoryInfo info = new TileFactoryInfo(0, max - 2, max, 256, true, true, // tile - // size - // is - // 256 - // and - // x/y - // orientation - // is - // normal - "x", "y", "z", "http://otile1.mqcdn.com/tiles/1.0.0/osm", // 5/15/10.png" - "http://otile2.mqcdn.com/tiles/1.0.0/osm", - "http://otile3.mqcdn.com/tiles/1.0.0/osm", - "http://otile4.mqcdn.com/tiles/1.0.0/osm") { - - @Override - public String[] getTileUrls(int x, int y, int zoom) { - zoom = max - zoom; - String[] result = new String[baseURLs.length]; - for (int i = 0; i < baseURLs.length; ++i) { - String url = this.baseURLs[i] + "/" + zoom + "/" + x + "/" + y + ".png"; - result[i] = url; - } - return result; - } - - }; - info.setDefaultZoomLevel(15); - - fact = new CustomTileFactory( - new TileFactoryInfoTileProvider(info, GeotoolsConverter.getInstance()), cache); - return fact; - } - - /** - * @see MapServer#cleanup() - */ - @Override - public void cleanup() { - if (fact != null) { - fact.cleanup(); - } - } - - @Override - public MapPainter getMapOverlay() { - return new TextPainter(true) { - - @Override - protected void configureGraphics(Graphics2D g) { - setAntialiasing(false); - - super.configureGraphics(g); - - g.setPaint(Color.BLACK); - } - - @Override - protected Color getBorderColor() { - return Color.WHITE; - } - - @Override - protected String getText() { - return "Data, imagery and map information provided by MapQuest, Open Street Map and contributors, CC-BY-SA"; - } - }; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.classpath b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.project b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.project deleted file mode 100644 index 169bec1a9e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - de.fhg.igd.mapviewer.server.tiles - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/edu.umd.cs.findbugs.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 64ac86b265..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Created from default preferences 28.07.2016 16:00:21 -#Thu Jul 28 16:00:21 CEST 2016 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.core.resources.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index cb8d2f1f42..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28.07.2016 16:00:21 -#Thu Jul 28 16:00:21 CEST 2016 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.jdt.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f27049f484..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.jdt.groovy.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.jdt.launching.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 648c6ebf5e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28.07.2016 16:00:21 -#Thu Jul 28 16:00:21 CEST 2016 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.jdt.ui.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index f852762295..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Created from default preferences 28.07.2016 16:00:21 -#Thu Jul 28 16:00:21 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.pde.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 9f43732b01..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28.07.2016 16:00:21 -#Thu Jul 28 16:00:21 CEST 2016 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.pde.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 0609ce4e70..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:37 PM -#Wed Jul 25 13:58:37 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/META-INF/MANIFEST.MF deleted file mode 100644 index 537dd011d1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/META-INF/MANIFEST.MF +++ /dev/null @@ -1,19 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Custom Tile Service -Bundle-SymbolicName: de.fhg.igd.mapviewer.server.tiles;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-Vendor: wetransform GmbH -Require-Bundle: de.fhg.igd.mapviewer, - org.eclipse.ui;bundle-version="3.5.0" -Import-Package: de.fhg.igd.eclipse.util.extension, - de.fhg.igd.mapviewer.server, - org.apache.commons.logging;version="1.1.1", - org.eclipse.osgi.util;version="1.1.0", - org.jdesktop.swingx.mapviewer;version="1.0.0", - org.jdesktop.swingx.painter;version="1.0.0" -Export-Package: de.fhg.igd.mapviewer.server.tiles, - de.fhg.igd.mapviewer.server.tiles.wizard, - de.fhg.igd.mapviewer.server.tiles.wizard.pages -Automatic-Module-Name: de.fhg.igd.mapviewer.server.tiles diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/build.properties b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/build.properties deleted file mode 100644 index e9863e281e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/plugin.xml b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/plugin.xml deleted file mode 100644 index 38ec789ced..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/plugin.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/CustomTileMapServer.java b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/CustomTileMapServer.java deleted file mode 100644 index 332e361d64..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/CustomTileMapServer.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (c) 2016 wetransform GmbH - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * wetransform GmbH - */ - -package de.fhg.igd.mapviewer.server.tiles; - -import java.awt.Color; -import java.awt.Graphics2D; - -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileFactory; -import org.jdesktop.swingx.mapviewer.TileFactoryInfo; -import org.jdesktop.swingx.mapviewer.TileFactoryInfoTileProvider; - -import de.fhg.igd.mapviewer.MapPainter; -import de.fhg.igd.mapviewer.painter.TextPainter; -import de.fhg.igd.mapviewer.server.CustomTileFactory; -import de.fhg.igd.mapviewer.server.MapServer; - -/** - * CustomTileMapServer. gets all the tiles from the URL-Pattern provided. - * - * @author Simon Templer - * - * @version $Id$ - */ -@SuppressWarnings("deprecation") -public class CustomTileMapServer extends CustomTileMapServerConfiguration { - - private CustomTileFactory fact; - - /** - * Default constructor - * - */ - public CustomTileMapServer() { - - } - - /** - * @see MapServer#getTileFactory(TileCache) - */ - @Override - public TileFactory getTileFactory(TileCache cache) { - - final int max = CustomTileMapServer.this.getZoomLevel() - 1; - - final int defaultMax = (max >= 2) ? (max - 2) : (max); - - TileFactoryInfo info = new TileFactoryInfo(0, defaultMax, max, 256, true, true, "x", "y", - "z") { - - @Override - public String[] getTileUrls(int x, int y, int zoom) { - zoom = max - zoom; - // http://tile.stamen.com/watercolor/{z}/{x}/{y}.jpg - - String createdUrl = getUrlPattern().replace("{z}", String.valueOf(zoom)) - .replace("{x}", String.valueOf(x)).replace("{y}", String.valueOf(y)); - - return new String[] { createdUrl }; - } - - }; - // setting a default Zoom level. which should be depends on 'max' - info.setDefaultZoomLevel(defaultMax); - - fact = new CustomTileFactory( - new TileFactoryInfoTileProvider(info, GeotoolsConverter.getInstance()), cache); - return fact; - } - - /** - * @see MapServer#cleanup() - */ - @Override - public void cleanup() { - if (fact != null) { - fact.cleanup(); - } - } - - @Override - public MapPainter getMapOverlay() { - return new TextPainter(true) { - - @Override - protected void configureGraphics(Graphics2D g) { - setAntialiasing(false); - - super.configureGraphics(g); - - g.setPaint(Color.BLACK); - } - - @Override - protected Color getBorderColor() { - return Color.WHITE; - } - - @Override - protected String getText() { - return CustomTileMapServer.this.getAttributionText(); - } - }; - } - -} \ No newline at end of file diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/CustomTileMapServerConfiguration.java b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/CustomTileMapServerConfiguration.java deleted file mode 100644 index 79cb1f829e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/CustomTileMapServerConfiguration.java +++ /dev/null @@ -1,231 +0,0 @@ -/* - * Copyright (c) 2016 wetransform GmbH - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * wetransform GmbH - */ - -package de.fhg.igd.mapviewer.server.tiles; - -import java.util.prefs.BackingStoreException; -import java.util.prefs.Preferences; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import de.fhg.igd.mapviewer.server.AbstractMapServer; - -/** - * abstract configuration of custom tile map server. It comprise methods to load - * and save map server information using preferences. - * - * @author Arun - */ -public abstract class CustomTileMapServerConfiguration extends AbstractMapServer { - - private static final Log log = LogFactory.getLog(CustomTileMapServerConfiguration.class); - - private static final String URL_PATTERN = "urlPattern"; - private static final String ATTRIBUTION = "attribution"; - private static final String ZOOM_LEVELS = "zoomLevels"; - - /** - * Default zoom levels - */ - public static final int DEFAULT_ZOOM_LEVELS = 16; - - /** - * URL pattern - */ - private String urlPattern; - - /** - * zoom level for CustomTileMapServer - */ - private int zoomLevel = DEFAULT_ZOOM_LEVELS; - - /** - * Attribution Text - */ - private String attributionText; - - /** - * The preferences - */ - private static final Preferences PREF_SERVERS = Preferences - .userNodeForPackage(CustomTileMapServer.class).node("customtiles"); - - /** - * Determines if a configuration name already exists - * - * @param name the configuration name - * @return if the name already exists - * @throws BackingStoreException if an error occurs accessing the - * preferences - */ - public boolean nameExists(String name) throws BackingStoreException { - return getPreferences().nodeExists(name); - } - - /** - * Preferences for CustomTileMapServer - * - * @return {@link Preferences} of custom Tile Map Server - */ - public Preferences getPreferences() { - return PREF_SERVERS; - } - - /** - * Remove the configuration with the given name - * - * @param name the name - * - * @return if removing the configuration succeeded - */ - public static boolean removeConfiguration(String name) { - try { - PREF_SERVERS.node(name).removeNode(); - return true; - } catch (BackingStoreException e) { - log.error("Error removing configuration " + name, e); //$NON-NLS-1$ - return false; - } - } - - /** - * Get the names of the existing configurations - * - * @return the configuration names - */ - public static String[] getConfigurationNames() { - try { - return PREF_SERVERS.childrenNames(); - } catch (BackingStoreException e) { - return new String[] {}; - } - } - - /** - * Save the configuration - * - */ - public void save() { - Preferences preferences = getPreferences(); - - try { - String name = getName(); - Preferences node = preferences.node(name); - setName(name); - - saveProperties(node); - - node.flush(); - } catch (BackingStoreException e) { - log.error("Error saving map server preferences", e); //$NON-NLS-1$ - } - } - - /** - * Load configuration with the given name - * - * @param name the configuration name - * - * @return if loading the configuration succeeded - */ - public boolean load(String name) { - Preferences preferences = getPreferences(); - - try { - if (preferences.nodeExists(name)) { - Preferences node = preferences.node(name); - - setName(name); - - loadProperties(node); - - return true; - } - else { - log.warn("No configuration named " + name + " found"); //$NON-NLS-1$ //$NON-NLS-2$ - return false; - } - } catch (BackingStoreException e) { - log.error("Error loading CustomTile configuration"); //$NON-NLS-1$ - return false; - } - } - - /** - * @return the urlPattern - */ - public String getUrlPattern() { - return urlPattern; - } - - /** - * @param urlPattern the urlPattern to set - */ - public void setUrlPattern(String urlPattern) { - this.urlPattern = urlPattern; - } - - /** - * @return the zoomLevel - */ - public int getZoomLevel() { - return zoomLevel; - } - - /** - * @param zoomLevel the zoomLevel to set - */ - public void setZoomLevel(int zoomLevel) { - this.zoomLevel = zoomLevel; - } - - /** - * @return the attributionText - */ - public String getAttributionText() { - return attributionText; - } - - /** - * @param attributionText the attributionText to set - */ - public void setAttributionText(String attributionText) { - this.attributionText = attributionText; - } - - /** - * Load the configuration's properties - * - * @param node the preference node - */ - protected void loadProperties(Preferences node) { - setUrlPattern(node.get(URL_PATTERN, null)); - setZoomLevel(node.getInt(ZOOM_LEVELS, DEFAULT_ZOOM_LEVELS)); - setAttributionText(node.get(ATTRIBUTION, null)); - } - - /** - * Save the configuration's properties to the given preference node - * - * @param node the preference node - */ - protected void saveProperties(Preferences node) { - node.put(URL_PATTERN, getUrlPattern()); - node.putInt(ZOOM_LEVELS, getZoomLevel()); - node.put(ATTRIBUTION, getAttributionText()); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/CustomTileMapServerFactory.java b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/CustomTileMapServerFactory.java deleted file mode 100644 index 22c6073cb5..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/CustomTileMapServerFactory.java +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Copyright (c) 2016 wetransform GmbH - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * wetransform GmbH - */ - -package de.fhg.igd.mapviewer.server.tiles; - -import java.util.LinkedList; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PlatformUI; - -import de.fhg.igd.eclipse.util.extension.AbstractObjectFactory; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; -import de.fhg.igd.mapviewer.server.MapServer; -import de.fhg.igd.mapviewer.server.MapServerFactory; -import de.fhg.igd.mapviewer.server.MapServerFactoryCollection; -import de.fhg.igd.mapviewer.server.tiles.wizard.CustomTileServerConfigurationWizard; - -/** - * CustomTileMapServerFactory - * - * @author Arun - */ -public class CustomTileMapServerFactory implements MapServerFactoryCollection { - - /** - * Map server factory for Custom Tiles server - * - * @author Arun - */ - public class CustomTileFactory extends AbstractObjectFactory - implements MapServerFactory { - - private final String name; - - /** - * Constructor - * - * @param name Name of the map - */ - public CustomTileFactory(String name) { - this.name = name; - } - - /** - * @see de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory#createExtensionObject() - */ - @Override - public MapServer createExtensionObject() throws Exception { - CustomTileMapServer server = new CustomTileMapServer(); - if (server.load(name)) { - return server; - } - else { - throw new IllegalArgumentException("Loading configuration " + name + " failed"); - } - } - - /** - * @see de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory#dispose(java.lang.Object) - */ - @Override - public void dispose(MapServer instance) { - instance.cleanup(); - } - - /** - * @see de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition#getIdentifier() - */ - @Override - public String getIdentifier() { - return getTypeName() + ":" + getDisplayName(); - } - - /** - * @see de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition#getDisplayName() - */ - @Override - public String getDisplayName() { - return name; - } - - /** - * @see de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition#getTypeName() - */ - @Override - public String getTypeName() { - return CustomTileMapServer.class.getName(); - } - - /** - * @see ExtensionObjectFactory#allowConfigure() - */ - @Override - public boolean allowConfigure() { - return true; - } - - /** - * @see ExtensionObjectFactory#configure() - */ - @Override - public boolean configure() { - try { - CustomTileMapServer server = (CustomTileMapServer) createExtensionObject(); - return CustomTileMapServerFactory.this.configure(server); - } catch (Exception e) { - return false; - } - } - } - - private static final Log log = LogFactory.getLog(CustomTileMapServerFactory.class); - - /** - * @see de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection#getName() - */ - @Override - public String getName() { - return "Custom Tile Maps"; - } - - /** - * @see de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection#allowRemove() - */ - @Override - public boolean allowRemove() { - return true; - } - - /** - * @see de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection#allowAddNew() - */ - @Override - public boolean allowAddNew() { - return true; - } - - /** - * @see de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection#addNew() - */ - @Override - public MapServerFactory addNew() { - MapServer server = createNewServer(); - if (server != null) { - return new CustomTileFactory(server.getName()); - } - return null; - } - - /** - * @see de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection#remove(de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory) - */ - @Override - public boolean remove(MapServerFactory factory) { - return CustomTileMapServer.removeConfiguration(factory.getDisplayName()); - } - - /** - * @see de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection#getFactories() - */ - @Override - public List getFactories() { - List results = new LinkedList(); - - // check if any Map Server is configured? - if (CustomTileMapServer.getConfigurationNames().length > 0) { - for (String name : CustomTileMapServer.getConfigurationNames()) { - if (name.equals("Stamen Terrain")) { - // Stamen Tiles were discontinued on 2023-10-31 - CustomTileMapServer.removeConfiguration(name); - } - else { - results.add(new CustomTileFactory(name)); - } - } - } - - if (results.isEmpty()) { - // no, then add default one. - results.add(addDefault()); - } - - return results; - } - - private MapServerFactory addDefault() { - MapServer server = addDefaultServer(); - if (server != null) { - return new CustomTileFactory(server.getName()); - } - return null; - } - - /** - * Creates a default Custom Tile map server from stamen tiles. url : - * http://tile.stamen.com/terrain/{z}/{x}/{y}.jpg - * - * @return the map server or null - */ - private MapServer addDefaultServer() { - CustomTileMapServer server = new CustomTileMapServer(); - - server.setName("OpenStreetMap"); - server.setUrlPattern("https://tile.openstreetmap.org/{z}/{x}/{y}.png"); - server.setZoomLevel(20); - server.setAttributionText("Map tiles by OpenStreetMap, under CC BY-SA 2.0"); - - server.save(); - return server; - } - - /** - * Creates a new Custom Tile map server - * - * @return the map server or null - */ - private MapServer createNewServer() { - CustomTileMapServer server = new CustomTileMapServer(); - - if (configure(server)) { - return server; - } - else { - return null; - } - } - - /** - * Configure the given WMS map server - * - * @param server the WMS map server - * @return if the configuration was saved - */ - private boolean configure(CustomTileMapServer server) { - try { - final Display display = PlatformUI.getWorkbench().getDisplay(); - - CustomTileServerConfigurationWizard wizard = new CustomTileServerConfigurationWizard( - server); - WizardDialog dialog = new WizardDialog(display.getActiveShell(), wizard); - if (dialog.open() == WizardDialog.OK) { - server.save(); - return true; - } - else - return false; - } catch (Exception e) { - log.error("Error configuring custom tile map server", e); - return false; - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/CustomTileServerConfigurationWizard.java b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/CustomTileServerConfigurationWizard.java deleted file mode 100644 index 92d6901b10..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/CustomTileServerConfigurationWizard.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2016 wetransform GmbH - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * wetransform GmbH - */ - -package de.fhg.igd.mapviewer.server.tiles.wizard; - -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jface.wizard.Wizard; - -import de.fhg.igd.mapviewer.server.tiles.CustomTileMapServerConfiguration; -import de.fhg.igd.mapviewer.server.tiles.wizard.pages.CustomTileServerConfigPage; -import de.fhg.igd.mapviewer.server.tiles.wizard.pages.CustomTileServerExtensionConfigPage; -import de.fhg.igd.mapviewer.server.tiles.wizard.pages.CustomTileWizardPage; - -/** - * Wizard to configure custom tile map server - * - * @author Arun - */ -public class CustomTileServerConfigurationWizard extends Wizard { - - CustomTileMapServerConfiguration configuration; - - /** - * Constructor - * - * @param configuration {@link CustomTileMapServerConfiguration} - */ - public CustomTileServerConfigurationWizard(CustomTileMapServerConfiguration configuration) { - this.configuration = configuration; - setWindowTitle("Custom Tile Map Configuration"); - } - - /** - * @see Wizard#addPages() - */ - @Override - public void addPages() { - addPage(new CustomTileServerConfigPage(this.configuration)); - addPage(new CustomTileServerExtensionConfigPage(this.configuration)); - } - - /** - * @see org.eclipse.jface.wizard.Wizard#performFinish() - */ - @Override - public boolean performFinish() { - for (IWizardPage page : getPages()) { - boolean valid = ((CustomTileWizardPage) page).updateConfiguration(configuration); - if (!valid) { - return false; - } - } - return true; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/Messages.java b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/Messages.java deleted file mode 100644 index 3380896099..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/Messages.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2016 wetransform GmbH - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * wetransform GmbH - */ - -package de.fhg.igd.mapviewer.server.tiles.wizard; - -import org.eclipse.osgi.util.NLS; - -/** - * Custom tile map server configuration messages - * - * @author Arun - */ -@SuppressWarnings("all") -public class Messages extends NLS { - - private static final String BUNDLE_NAME = "de.fhg.igd.mapviewer.server.tiles.wizard.messages"; //$NON-NLS-1$ - public static String BasicConfigurationPage_0; - public static String BasicConfigurationPage_1; - public static String BasicConfigurationPage_2; - public static String BasicConfigurationPage_3; - public static String BasicConfigurationPage_4; - public static String BasicConfigurationPage_5; - public static String BasicConfigurationPage_6; - public static String BasicConfigurationPage_7; - public static String BasicConfigurationPage_8; - public static String BasicConfigurationPage_9; - public static String BasicConfigurationPage_10; - public static String BasicConfigurationPage_11; - public static String ServerNameFieldEditor_0; - public static String ServerNameFieldEditor_1; - public static String URLFieldEditor_0; - - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/messages.properties b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/messages.properties deleted file mode 100644 index a2a79fb410..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/messages.properties +++ /dev/null @@ -1,15 +0,0 @@ -BasicConfigurationPage_0=Basic Configuration -BasicConfigurationPage_1=Custom Tile Map Server -BasicConfigurationPage_2=Please specify the Custom Tile Map server URL pattern to use. -BasicConfigurationPage_3=Name -BasicConfigurationPage_4=Name of the Server -BasicConfigurationPage_5=URL Pattern -BasicConfigurationPage_6=A URL should comprised with {x}, {y} and {z} -BasicConfigurationPage_7=Number of zoom levels -BasicConfigurationPage_8=Attribution Text -BasicConfigurationPage_9=Basic Configuration(Cont..) -BasicConfigurationPage_10=Specify the maximum zoom level and attribution text of map tiles -BasicConfigurationPage_11=URL pattern should comprise {x},{y} and {z} literals. While fetching tiles from given server,\n {x}, {y} and {z} will be replaced by the x coordinates, y coordinates and zoom level respectively. -ServerNameFieldEditor_0=Invalid character: / -ServerNameFieldEditor_1=A CustomTileServer with the given name already exists -URLFieldEditor_0=A URL pattern should consist {x}, {y} and {z} literals. diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/ConfigurationNameFieldEditor.java b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/ConfigurationNameFieldEditor.java deleted file mode 100644 index de305beb4d..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/ConfigurationNameFieldEditor.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2016 wetransform GmbH - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * wetransform GmbH - */ - -package de.fhg.igd.mapviewer.server.tiles.wizard.pages; - -import org.eclipse.jface.preference.StringFieldEditor; - -import de.fhg.igd.mapviewer.server.tiles.CustomTileMapServerConfiguration; -import de.fhg.igd.mapviewer.server.tiles.wizard.Messages; - -/** - * Custom tile map server Name editor - * - * @author Arun - */ -public class ConfigurationNameFieldEditor extends StringFieldEditor { - - private final CustomTileMapServerConfiguration configuration; - - /** - * Default constructor - * - * @param configuration the WMS configuration - */ - public ConfigurationNameFieldEditor(CustomTileMapServerConfiguration configuration) { - super(); - - setEmptyStringAllowed(false); - - this.configuration = configuration; - } - - /** - * @see StringFieldEditor#doCheckState() - */ - @Override - protected boolean doCheckState() { - String text = getStringValue(); - - if (text.indexOf('/') >= 0) { // invalid characters - setErrorMessage(Messages.ServerNameFieldEditor_0); - return false; - } - - try { - // don't allow already existing names - boolean exists = configuration.nameExists(text); - if (exists) { - setErrorMessage(Messages.ServerNameFieldEditor_1); - } - return !exists; - } catch (Exception e) { - setErrorMessage(e.getLocalizedMessage()); - return false; - } - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/ConfigurationURLFieldEditor.java b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/ConfigurationURLFieldEditor.java deleted file mode 100644 index bc5e1b8189..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/ConfigurationURLFieldEditor.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2016 wetransform GmbH - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * wetransform GmbH - */ - -package de.fhg.igd.mapviewer.server.tiles.wizard.pages; - -import org.eclipse.jface.preference.StringFieldEditor; - -import de.fhg.igd.mapviewer.server.tiles.wizard.Messages; - -/** - * Custom tile map server URL pattern editor - * - * @author Arun - */ -public class ConfigurationURLFieldEditor extends StringFieldEditor { - - /** - * Default constructor - * - */ - public ConfigurationURLFieldEditor() { - super(); - setEmptyStringAllowed(false); - } - - /** - * @see StringFieldEditor#doCheckState() - */ - @Override - protected boolean doCheckState() { - String text = getStringValue(); - - // string should contain {x}, {y} and {z} literals - if (text.contains("{x}") && text.contains("{y}") && text.contains("{z}")) { - return true; - } - // else show message and return false - setErrorMessage(Messages.URLFieldEditor_0); - return false; - - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/CustomTileServerConfigPage.java b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/CustomTileServerConfigPage.java deleted file mode 100644 index 593c743567..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/CustomTileServerConfigPage.java +++ /dev/null @@ -1,186 +0,0 @@ -/* - * Copyright (c) 2016 wetransform GmbH - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * wetransform GmbH - */ - -package de.fhg.igd.mapviewer.server.tiles.wizard.pages; - -import org.eclipse.jface.preference.FieldEditor; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.FocusEvent; -import org.eclipse.swt.events.FocusListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; - -import de.fhg.igd.mapviewer.server.tiles.CustomTileMapServerConfiguration; -import de.fhg.igd.mapviewer.server.tiles.wizard.Messages; - -/** - * Basic custom tile map server configuration page - * - * @author Arun - */ -public class CustomTileServerConfigPage extends CustomTileWizardPage - implements IPropertyChangeListener { - - private Composite page; - - /** - * Server Name field - */ - private ConfigurationNameFieldEditor name; - /** - * URL pattern field - */ - private ConfigurationURLFieldEditor url; - - private boolean checkName = true; - - /** - * Constructor - * - * @param configuration Custom Tile Map Server configuration - */ - public CustomTileServerConfigPage(CustomTileMapServerConfiguration configuration) { - super(configuration, Messages.BasicConfigurationPage_0); - setTitle(Messages.BasicConfigurationPage_1); - setMessage(Messages.BasicConfigurationPage_2); - } - - /** - * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) - */ - @Override - public void createControl(Composite parent) { - page = new Composite(parent, SWT.NONE); - page.setLayout(new GridLayout(3, false)); - - createComponent(); - - setControl(page); - - update(); - } - - /** - * Create components for basic options, the server name and URL pattern. - */ - protected void createComponent() { - - // name - String serverName = getConfiguration().getName(); - boolean enterName = serverName == null || serverName.isEmpty(); - - name = new ConfigurationNameFieldEditor(getConfiguration()); - name.fillIntoGrid(page, 3); - name.setStringValue(serverName); - if (!enterName) { - checkName = false; - name.setEnabled(false, page); - } - name.setLabelText(Messages.BasicConfigurationPage_3); - name.setPage(this); - name.setPropertyChangeListener(new IPropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(FieldEditor.IS_VALID)) { - update(); - } - } - }); - - final String nameTip = Messages.BasicConfigurationPage_4; - name.getTextControl(page).addFocusListener(new FocusListener() { - - @Override - public void focusLost(FocusEvent e) { - setMessage(null); - } - - @Override - public void focusGained(FocusEvent e) { - setMessage(nameTip, INFORMATION); - } - }); - - // url - url = new ConfigurationURLFieldEditor(); - url.fillIntoGrid(page, 3); - url.setEmptyStringAllowed(false); - url.setStringValue(getConfiguration().getUrlPattern()); - url.setLabelText(Messages.BasicConfigurationPage_5); - url.getTextControl(page).setToolTipText(Messages.BasicConfigurationPage_5); - url.setPage(this); - url.setPropertyChangeListener(new IPropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(FieldEditor.IS_VALID)) { - update(); - } - } - }); - - final String urlTip = Messages.BasicConfigurationPage_5; - url.getTextControl(page).addFocusListener(new FocusListener() { - - @Override - public void focusLost(FocusEvent e) { - setMessage(null); - } - - @Override - public void focusGained(FocusEvent e) { - setMessage(urlTip, INFORMATION); - } - }); - - // url information - Label label = new Label(page, SWT.WRAP); - label.setText(Messages.BasicConfigurationPage_11); - label.setLayoutData(new GridData(SWT.HORIZONTAL, SWT.TOP, true, false, 3, 1)); - } - - /** - * To update configuration - * - * @param configuration {@link CustomTileMapServerConfiguration} - * @return true or false based on validity of fields - */ - @Override - public boolean updateConfiguration(CustomTileMapServerConfiguration configuration) { - if (url.isValid() && (!checkName || name.isValid())) { - configuration.setUrlPattern(url.getStringValue()); - configuration.setName(name.getStringValue()); - return true; - } - - return false; - } - - private void update() { - setPageComplete(url.isValid() && (!checkName || name.isValid())); - } - - @Override - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(FieldEditor.IS_VALID)) { - update(); - } - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/CustomTileServerExtensionConfigPage.java b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/CustomTileServerExtensionConfigPage.java deleted file mode 100644 index 3ec771e12e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/CustomTileServerExtensionConfigPage.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright (c) 2016 wetransform GmbH - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * wetransform GmbH - */ - -package de.fhg.igd.mapviewer.server.tiles.wizard.pages; - -import org.eclipse.jface.preference.FieldEditor; -import org.eclipse.jface.preference.IntegerFieldEditor; -import org.eclipse.jface.preference.StringFieldEditor; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.FocusEvent; -import org.eclipse.swt.events.FocusListener; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; - -import de.fhg.igd.mapviewer.server.tiles.CustomTileMapServerConfiguration; -import de.fhg.igd.mapviewer.server.tiles.wizard.Messages; - -/** - * Extension of basic custom tile map server configuration page - * - * @author Arun - */ -public class CustomTileServerExtensionConfigPage extends CustomTileWizardPage - implements IPropertyChangeListener { - - private Composite page; - - private IntegerFieldEditor zoomLevels; - - private StringFieldEditor attributionText; - - /** - * Constructor - * - * @param configuration {@link CustomTileMapServerConfiguration} - */ - public CustomTileServerExtensionConfigPage(CustomTileMapServerConfiguration configuration) { - super(configuration, Messages.BasicConfigurationPage_0); - setTitle(Messages.BasicConfigurationPage_1); - setMessage(Messages.BasicConfigurationPage_10); - } - - /** - * @see de.fhg.igd.mapviewer.server.tiles.wizard.pages.CustomTileWizardPage#updateConfiguration(de.fhg.igd.mapviewer.server.tiles.CustomTileMapServerConfiguration) - */ - @Override - public boolean updateConfiguration(CustomTileMapServerConfiguration configuration) { - if (zoomLevels.isValid()) { - configuration.setZoomLevel(zoomLevels.getIntValue()); - configuration.setAttributionText(attributionText.getStringValue()); - return true; - } - return false; - } - - /** - * @see de.fhg.igd.mapviewer.server.tiles.wizard.pages.CustomTileWizardPage#createControl(org.eclipse.swt.widgets.Composite) - */ - @Override - public void createControl(Composite parent) { - page = new Composite(parent, SWT.NONE); - page.setLayout(new GridLayout(3, false)); - - createComponent(); - - setControl(page); - - update(); - } - - /** - * Create components for basic options, zoom level and attribution text. - */ - protected void createComponent() { - - // zoom levels - zoomLevels = new IntegerFieldEditor("ZoomLevels", Messages.BasicConfigurationPage_7, page); //$NON-NLS-1$ - zoomLevels.fillIntoGrid(page, 3); - zoomLevels.setValidRange(1, 100); - zoomLevels.setStringValue(String.valueOf(getConfiguration().getZoomLevel())); - zoomLevels.setPage(this); - zoomLevels.setPropertyChangeListener(this); - - final String zoomLevelsTip = Messages.BasicConfigurationPage_7; - - zoomLevels.getLabelControl(page).setToolTipText(zoomLevelsTip); - zoomLevels.getTextControl(page).setToolTipText(zoomLevelsTip); - zoomLevels.getTextControl(page).addFocusListener(new FocusListener() { - - @Override - public void focusLost(FocusEvent e) { - setMessage(null); - } - - @Override - public void focusGained(FocusEvent e) { - setMessage(zoomLevelsTip, INFORMATION); - } - }); - - // attribution text - attributionText = new StringFieldEditor("AttributionText", - Messages.BasicConfigurationPage_8, page); - - attributionText.fillIntoGrid(page, 3); - attributionText.setPage(this); - if (getConfiguration().getAttributionText() != null) - attributionText.setStringValue(String.valueOf(getConfiguration().getAttributionText())); - else - attributionText.setStringValue(""); - - final String attributionTip = Messages.BasicConfigurationPage_8; - attributionText.getLabelControl(page).setToolTipText(attributionTip); - attributionText.getTextControl(page).setToolTipText(attributionTip); - - attributionText.getTextControl(page).addFocusListener(new FocusListener() { - - @Override - public void focusLost(FocusEvent e) { - setMessage(null); - } - - @Override - public void focusGained(FocusEvent e) { - setMessage(attributionTip, INFORMATION); - } - }); - - } - - private void update() { - setPageComplete(zoomLevels.isValid()); - } - - /** - * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) - */ - @Override - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(FieldEditor.IS_VALID)) { - update(); - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/CustomTileWizardPage.java b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/CustomTileWizardPage.java deleted file mode 100644 index eb21e477d1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/src/de/fhg/igd/mapviewer/server/tiles/wizard/pages/CustomTileWizardPage.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2016 wetransform GmbH - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * wetransform GmbH - */ - -package de.fhg.igd.mapviewer.server.tiles.wizard.pages; - -import org.eclipse.jface.wizard.WizardPage; - -import de.fhg.igd.mapviewer.server.tiles.CustomTileMapServerConfiguration; - -/** - * Basic Wizard page for custom tile map server configuration - * - * @author Arun - */ -public abstract class CustomTileWizardPage extends WizardPage { - - private final CustomTileMapServerConfiguration configuration; - - /** - * Default constructor - * - * @param configuration {@link CustomTileMapServerConfiguration} - * @param name name of the server - */ - public CustomTileWizardPage(CustomTileMapServerConfiguration configuration, String name) { - super(name); - this.configuration = configuration; - } - - /** - * To get configuration supplied - * - * @return the configuration {@link CustomTileMapServerConfiguration} - */ - public CustomTileMapServerConfiguration getConfiguration() { - return configuration; - } - - /** - * To update configuration - * - * @param configuration {@link CustomTileMapServerConfiguration} - * @return true or false based on validity of fields - */ - public abstract boolean updateConfiguration(CustomTileMapServerConfiguration configuration); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.classpath b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.project b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.project deleted file mode 100644 index 080ae09bf3..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - de.fhg.igd.mapviewer.server.wms - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/edu.umd.cs.findbugs.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 58ce6d564e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.core.resources.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index ff635dadef..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.jdt.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ab99a2ded1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,428 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.jdt.groovy.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.jdt.launching.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 706de46d84..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.jdt.ui.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index b90cfe5125..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,68 +0,0 @@ -#Updated from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com;de; -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.pde.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index b89019d193..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Jul 08 13:53:06 CEST 2009 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.pde.prefs b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 0609ce4e70..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:37 PM -#Wed Jul 25 13:58:37 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/META-INF/MANIFEST.MF deleted file mode 100644 index b5a47562c6..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/META-INF/MANIFEST.MF +++ /dev/null @@ -1,32 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: WMS Map Server -Bundle-SymbolicName: de.fhg.igd.mapviewer.server.wms;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-Vendor: Fraunhofer IGD -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: de.fhg.igd.eclipse.ui.util.extension, - de.fhg.igd.eclipse.util.extension, - de.fhg.igd.geom, - de.fhg.igd.mapviewer, - de.fhg.igd.mapviewer.concurrency, - de.fhg.igd.mapviewer.server;version="1.0.0", - de.fhg.igd.mapviewer.view.overlay;version="1.0.0", - de.fhg.igd.osgi.util;version="1.0.0", - edu.umd.cs.findbugs.annotations, - eu.esdihumboldt.util.http, - org.apache.commons.logging, - org.geotools.referencing;version="29.1.0.combined", - org.jdesktop.swingx.graphics, - org.jdesktop.swingx.mapviewer;version="1.0.0", - org.jdesktop.swingx.mapviewer.empty;version="1.0.0", - org.jdesktop.swingx.painter, - org.opengis.referencing, - org.opengis.referencing.crs -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0", - org.eclipse.ui;bundle-version="3.5.0" -Export-Package: de.fhg.igd.mapviewer.server.wms, - de.fhg.igd.mapviewer.server.wms.capabilities, - de.fhg.igd.mapviewer.server.wms.overlay, - de.fhg.igd.mapviewer.server.wms.wizard -Automatic-Module-Name: de.fhg.igd.mapviewer.server.wms diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/build.properties b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/build.properties deleted file mode 100644 index e9863e281e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/plugin.xml b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/plugin.xml deleted file mode 100644 index 4a8445c02f..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/plugin.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/Messages.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/Messages.java deleted file mode 100644 index eb127b9253..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/Messages.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms; - -import org.eclipse.osgi.util.NLS; - -/** - * Message bundle. - * - * @author Simon Templer - */ -@SuppressWarnings("all") -public class Messages extends NLS { - - private static final String BUNDLE_NAME = "de.fhg.igd.mapviewer.server.wms.messages"; //$NON-NLS-1$ - public static String SRSConfigurationPage_0; - public static String SRSConfigurationPage_2; - public static String SRSConfigurationPage_3; - public static String TileConfigurationPage_0; - public static String TileConfigurationPage_1; - public static String TileConfigurationPage_2; - public static String TileConfigurationPage_3; - public static String TileConfigurationPage_4; - public static String TileConfigurationPage_5; - public static String TileConfigurationPage_6; - public static String TileConfigurationPage_7; - public static String TileConfigurationPage_8; - public static String WMSMapServerFactory_3; - public static String WMSTileOverlay_0; - public static String WMSTileOverlay_1; - public static String WMSTileOverlay_2; - public static String WMSTileOverlay_3; - public static String WMSTileOverlay_5; - public static String WMSTileOverlayCollection_1; - public static String WMSUtil_10; - public static String WMSUtil_8; - public static String WMSUtil_9; - - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSConfiguration.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSConfiguration.java deleted file mode 100644 index 2cbe3d3b80..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSConfiguration.java +++ /dev/null @@ -1,239 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms; - -import java.util.prefs.BackingStoreException; -import java.util.prefs.Preferences; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSUtil; - -/** - * Basic WMS client configuration - * - * @author Simon Templer - */ -public abstract class WMSConfiguration { - - private static final Log log = LogFactory.getLog(WMSConfiguration.class); - - /** - * Any SRS - */ - public static final int DEFAULT_PREFERRED_EPSG = 0; - - // preference names - private static final String PREFERRED_EPSG = "preferredEpsg"; //$NON-NLS-1$ - private static final String BASE_URL = "baseUrl"; //$NON-NLS-1$ - private static final String LAYERS = "layers"; //$NON-NLS-1$ - - private String name = ""; //$NON-NLS-1$ - private String baseUrl; - private int preferredEpsg = DEFAULT_PREFERRED_EPSG; - - private String layers = ""; //$NON-NLS-1$ - - /** - * Validate the configuration - * - * @return if the configuration is valid - */ - public boolean validateSettings() { - try { - WMSUtil.getCapabilities(baseUrl); - return true; - } catch (Exception e) { - log.error("Error validating wms settings", e); //$NON-NLS-1$ - return false; - } - } - - /** - * Get the configuration name - * - * @return the configuration name - */ - public String getName() { - return name; - } - - /** - * Set the configuration name - * - * @param name the configuration name - */ - public void setName(String name) { - this.name = name; - } - - /** - * Determines if a configuration name already exists - * - * @param name the configuration name - * @return if the name already exists - * @throws BackingStoreException if an error occurs accessing the - * preferences - */ - public boolean nameExists(String name) throws BackingStoreException { - return getPreferences().nodeExists(name); - } - - /** - * Get the base URL - * - * @return the base URL - */ - public String getBaseUrl() { - return baseUrl; - } - - /** - * Set the base URL - * - * @param baseUrl the base URL - */ - public void setBaseUrl(String baseUrl) { - this.baseUrl = baseUrl; - } - - /** - * Get the EPSG code of the preferred SRS - * - * @return the EPSG code of the preferred SRS, zero if no SRS is preferred - */ - public int getPreferredEpsg() { - return preferredEpsg; - } - - /** - * Set the EPSG code of the preferred SRS - * - * @param preferredEpsg the EPSG code, zero stands for any SRS - */ - public void setPreferredEpsg(int preferredEpsg) { - this.preferredEpsg = preferredEpsg; - } - - /** - * Get the configured layers - * - * @return the layers - */ - public String getLayers() { - return layers; - } - - /** - * Set the configured layers - * - * @param layers the layers - */ - public void setLayers(String layers) { - this.layers = layers; - } - - /** - * Save the configuration - * - * @param overwrite if old settings/servers with the same name shall be - * overridden - */ - public void save(boolean overwrite) { - Preferences preferences = getPreferences(); - - try { - String name = getName(); - - if (!overwrite) { - int i = 1; - // find unique name - while (preferences.nodeExists(name)) { - name = getName() + "_" + i; //$NON-NLS-1$ - i++; - } - } - - Preferences node = preferences.node(name); - setName(name); - - saveProperties(node); - - node.flush(); - } catch (BackingStoreException e) { - log.error("Error saving map server preferences", e); //$NON-NLS-1$ - } - } - - /** - * Get the preferences where the configurations are saved - * - * @return the preferences - */ - protected abstract Preferences getPreferences(); - - /** - * Save the configuration's properties to the given preference node - * - * @param node the preference node - */ - protected void saveProperties(Preferences node) { - node.put(BASE_URL, getBaseUrl()); - node.putInt(PREFERRED_EPSG, getPreferredEpsg()); - node.put(LAYERS, getLayers()); - } - - /** - * Load a WMS configuration with the given name - * - * @param name the configuration name - * - * @return if loading the configuration succeeded - */ - public boolean load(String name) { - Preferences preferences = getPreferences(); - - try { - if (preferences.nodeExists(name)) { - Preferences node = preferences.node(name); - - setName(name); - - loadProperties(node); - - return true; - } - else { - log.warn("No configuration named " + name + " found"); //$NON-NLS-1$ //$NON-NLS-2$ - return false; - } - } catch (BackingStoreException e) { - log.error("Error loading WMS configuration"); //$NON-NLS-1$ - return false; - } - } - - /** - * Load the configuration's properties - * - * @param node the preference node - */ - protected void loadProperties(Preferences node) { - setBaseUrl(node.get(BASE_URL, null)); - setPreferredEpsg(node.getInt(PREFERRED_EPSG, DEFAULT_PREFERRED_EPSG)); - setLayers(node.get(LAYERS, "")); //$NON-NLS-1$ - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSMapServer.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSMapServer.java deleted file mode 100644 index a37ff84705..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSMapServer.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms; - -import java.util.prefs.BackingStoreException; -import java.util.prefs.Preferences; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileFactory; -import org.jdesktop.swingx.mapviewer.empty.EmptyTileFactory; - -import de.fhg.igd.mapviewer.MapPainter; -import de.fhg.igd.mapviewer.server.CustomTileFactory; -import de.fhg.igd.mapviewer.server.MapServer; - -/** - * WMSMapServer - * - * @author Simon Templer - * - * @version $Id$ - */ -public class WMSMapServer extends WMSTileConfiguration implements MapServer { - - private static final Log log = LogFactory.getLog(WMSMapServer.class); - - private TileFactory factory = null; - private WMSTileProvider provider = null; - - /** - * The preferences - */ - private static final Preferences PREF_SERVERS = Preferences - .userNodeForPackage(WMSMapServer.class).node("servers"); //$NON-NLS-1$ - - /** - * @see MapServer#cleanup() - */ - @Override - public void cleanup() { - if (factory != null) - factory.cleanup(); - } - - /** - * @see MapServer#getMapOverlay() - */ - @Override - public MapPainter getMapOverlay() { - return null; - } - - /** - * @see MapServer#getTileFactory(TileCache) - */ - @Override - public TileFactory getTileFactory(TileCache cache) { - try { - provider = new WMSTileProvider(getBaseUrl(), getPreferredEpsg(), getZoomLevels(), - getMinTileSize(), getMinMapSize(), getLayers()); - factory = new CustomTileFactory(provider, cache); - } catch (Exception e) { - log.error("Error creating wms tile provider", e); //$NON-NLS-1$ - factory = new EmptyTileFactory(); - provider = null; - } - - return factory; - } - - /** - * @see WMSConfiguration#getPreferences() - */ - @Override - public Preferences getPreferences() { - return PREF_SERVERS; - } - - /** - * Remove the configuration with the given name - * - * @param name the name - * - * @return if removing the configuration succeeded - */ - public static boolean removeConfiguration(String name) { - try { - PREF_SERVERS.node(name).removeNode(); - return true; - } catch (BackingStoreException e) { - log.error("Error removing configuration " + name, e); //$NON-NLS-1$ - return false; - } - } - - /** - * Get the names of the existing configurations - * - * @return the configuration names - */ - public static String[] getConfigurationNames() { - try { - return PREF_SERVERS.childrenNames(); - } catch (BackingStoreException e) { - return new String[] {}; - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSMapServerFactory.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSMapServerFactory.java deleted file mode 100644 index 7c9e8fddfd..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSMapServerFactory.java +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms; - -import java.util.LinkedList; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PlatformUI; - -import de.fhg.igd.eclipse.util.extension.AbstractObjectFactory; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection; -import de.fhg.igd.mapviewer.server.MapServer; -import de.fhg.igd.mapviewer.server.MapServerFactory; -import de.fhg.igd.mapviewer.server.MapServerFactoryCollection; -import de.fhg.igd.mapviewer.server.wms.wizard.WMSConfigurationWizard; -import de.fhg.igd.mapviewer.server.wms.wizard.WMSTileConfigurationWizard; - -/** - * WMSMapServerFactory - * - * @author Simon Templer - * - * @version $Id$ - */ -public class WMSMapServerFactory implements MapServerFactoryCollection { - - /** - * WMS server factory - */ - public class WMSFactory extends AbstractObjectFactoryimplements MapServerFactory { - - private final String name; - - /** - * Constructor - * - * @param name the WMS map name - */ - public WMSFactory(String name) { - super(); - - this.name = name; - } - - /** - * @see ExtensionObjectFactory#createExtensionObject() - */ - @Override - public MapServer createExtensionObject() throws Exception { - WMSMapServer server = new WMSMapServer(); - if (server.load(name)) { - return server; - } - else { - throw new IllegalArgumentException("Loading configuration " + name + " failed"); //$NON-NLS-1$ //$NON-NLS-2$ - } - } - - /** - * @see ExtensionObjectDefinition#getDisplayName() - */ - @Override - public String getDisplayName() { - return name; - } - - /** - * @see ExtensionObjectDefinition#getIdentifier() - */ - @Override - public String getIdentifier() { - return getTypeName() + ":" + getDisplayName(); //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectDefinition#getTypeName() - */ - @Override - public String getTypeName() { - return WMSMapServerFactory.class.getName(); - } - - /** - * @see AbstractObjectFactory#allowConfigure() - */ - @Override - public boolean allowConfigure() { - return true; - } - - /** - * @see AbstractObjectFactory#configure() - */ - @Override - public boolean configure() { - try { - WMSMapServer server = (WMSMapServer) createExtensionObject(); - return WMSMapServerFactory.this.configure(server, true); - } catch (Exception e) { - return false; - } - } - - /** - * @see ExtensionObjectFactory#dispose(java.lang.Object) - */ - @Override - public void dispose(MapServer instance) { - instance.cleanup(); - } - - } - - private static final Log log = LogFactory.getLog(WMSMapServerFactory.class); - - /** - * @see ExtensionObjectFactoryCollection#addNew() - */ - @Override - public MapServerFactory addNew() { - MapServer server = createNewServer(); - if (server != null) { - return new WMSFactory(server.getName()); - } - else { - return null; - } - } - - /** - * @see ExtensionObjectFactoryCollection#allowAddNew() - */ - @Override - public boolean allowAddNew() { - return true; - } - - /** - * @see ExtensionObjectFactoryCollection#allowRemove() - */ - @Override - public boolean allowRemove() { - return true; - } - - /** - * @see ExtensionObjectFactoryCollection#getFactories() - */ - @Override - public List getFactories() { - List results = new LinkedList(); - - for (String name : WMSMapServer.getConfigurationNames()) { - results.add(new WMSFactory(name)); - } - - return results; - } - - /** - * @see ExtensionObjectFactoryCollection#getName() - */ - @Override - public String getName() { - return Messages.WMSMapServerFactory_3; - } - - /** - * @see ExtensionObjectFactoryCollection#remove(ExtensionObjectFactory) - */ - @Override - public boolean remove(MapServerFactory factory) { - return WMSMapServer.removeConfiguration(factory.getDisplayName()); - } - - /** - * Creates a new WMS map server - * - * @return the map server or null - */ - private MapServer createNewServer() { - WMSMapServer server = new WMSMapServer(); - - if (configure(server, false)) { - return server; - } - else { - return null; - } - } - - /** - * Configure the given WMS map server - * - * @param server the WMS map server - * @param overwrite if old settings may be overridden - * @return if the configuration was saved - */ - private boolean configure(WMSMapServer server, boolean overwrite) { - try { - final Display display = PlatformUI.getWorkbench().getDisplay(); - - WMSConfigurationWizard wizard = new WMSTileConfigurationWizard( - server, true); - WizardDialog dialog = new WizardDialog(display.getActiveShell(), wizard); - if (dialog.open() == WizardDialog.OK) { - server.save(overwrite); - return true; - } - else - return false; - } catch (Exception e) { - log.error("Error configuring wms map server", e); //$NON-NLS-1$ - return false; - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSResolutionConfiguration.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSResolutionConfiguration.java deleted file mode 100644 index 3d9faeec34..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSResolutionConfiguration.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.server.wms; - -import java.util.prefs.Preferences; - -/** - * Extend WMSMap configuration to configure resolution for orthophotos. - * - * @author Benedikt Hiemenz - */ -public class WMSResolutionConfiguration extends WMSConfiguration { - - /** - * Default size x - */ - public static final int DEFAULT_X_SIZE = 2048; - - /** - * Default size y - */ - public static final int DEFAULT_Y_SIZE = 2048; - - // preference names - private static final String X_SIZE = "xSize"; //$NON-NLS-1$ - private static final String Y_SIZE = "ySize"; //$NON-NLS-1$ - - private int xTileSize = DEFAULT_X_SIZE; - private int yTileSize = DEFAULT_Y_SIZE; - - /** - * The preferences - */ - private static final Preferences PREF_SERVERS = Preferences - .userNodeForPackage(WMSResolutionConfiguration.class).node("configuration"); //$NON-NLS-1$ - - @Override - protected void saveProperties(Preferences node) { - - super.saveProperties(node); - node.putInt(X_SIZE, getxTileSize()); - node.putInt(Y_SIZE, getxTileSize()); - } - - @Override - protected void loadProperties(Preferences node) { - - super.loadProperties(node); - setxTileSize(node.getInt(X_SIZE, DEFAULT_X_SIZE)); - setyTileSize(node.getInt(Y_SIZE, DEFAULT_Y_SIZE)); - } - - /** - * @return the xTileSize - */ - public int getxTileSize() { - return xTileSize; - } - - /** - * @param xTileSize the xTileSize to set - */ - public void setxTileSize(int xTileSize) { - this.xTileSize = xTileSize; - } - - /** - * @return the yTileSize - */ - public int getyTileSize() { - return yTileSize; - } - - /** - * @param yTileSize the yTileSize to set - */ - public void setyTileSize(int yTileSize) { - this.yTileSize = yTileSize; - } - - @Override - protected Preferences getPreferences() { - return PREF_SERVERS; - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSTileConfiguration.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSTileConfiguration.java deleted file mode 100644 index c73082a370..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSTileConfiguration.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms; - -import java.util.prefs.Preferences; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * WMS configuration including tiling options - * - * @author Simon Templer - */ -public abstract class WMSTileConfiguration extends WMSConfiguration { - - private static final Log log = LogFactory.getLog(WMSTileConfiguration.class); - - /** - * Default minimum map size - */ - public static final int DEFAULT_MIN_MAP_SIZE = 512; - - /** - * Default minimum tile size - */ - public static final int DEFAULT_MIN_TILE_SIZE = 256; - - /** - * Default zoom levels - */ - public static final int DEFAULT_ZOOM_LEVELS = 16; - - // preference names - private static final String MIN_MAP_SIZE = "minMapSize"; //$NON-NLS-1$ - private static final String ZOOM_LEVELS = "zoomLevels"; //$NON-NLS-1$ - private static final String MIN_TILE_SIZE = "minTileSize"; //$NON-NLS-1$ - - private int zoomLevels = DEFAULT_ZOOM_LEVELS; - private int minTileSize = DEFAULT_MIN_TILE_SIZE; - private int minMapSize = DEFAULT_MIN_MAP_SIZE; - - /** - * @see WMSConfiguration#validateSettings() - */ - @Override - public boolean validateSettings() { - try { - new WMSTileProvider(getBaseUrl(), getPreferredEpsg(), zoomLevels, minTileSize, - minMapSize, null); - return true; - } catch (Exception e) { - log.error("Error validating wms settings", e); //$NON-NLS-1$ - return false; - } - } - - /** - * Get the number of zoom levels - * - * @return the number of zoom levels - */ - public int getZoomLevels() { - return zoomLevels; - } - - /** - * Set the number of zoom levels - * - * @param zoomLevels the number of zoom levels - */ - public void setZoomLevels(int zoomLevels) { - this.zoomLevels = zoomLevels; - } - - /** - * Get the minimum tile size - * - * @return the minimum tile size - */ - public int getMinTileSize() { - return minTileSize; - } - - /** - * Set the minimum tile size - * - * @param minTileSize the minimum tile size - */ - public void setMinTileSize(int minTileSize) { - this.minTileSize = minTileSize; - } - - /** - * Get the minimum map size - * - * @return the minimum map size - */ - public int getMinMapSize() { - return minMapSize; - } - - /** - * Set the minimum map size - * - * @param minMapSize the minimum map size - */ - public void setMinMapSize(int minMapSize) { - this.minMapSize = minMapSize; - } - - /** - * @see WMSConfiguration#saveProperties(Preferences) - */ - @Override - protected void saveProperties(Preferences node) { - super.saveProperties(node); - - node.putInt(ZOOM_LEVELS, getZoomLevels()); - node.putInt(MIN_TILE_SIZE, getMinTileSize()); - node.putInt(MIN_MAP_SIZE, getMinMapSize()); - } - - /** - * @see WMSConfiguration#loadProperties(Preferences) - */ - @Override - protected void loadProperties(Preferences node) { - super.loadProperties(node); - - setZoomLevels(node.getInt(ZOOM_LEVELS, DEFAULT_ZOOM_LEVELS)); - setMinTileSize(node.getInt(MIN_TILE_SIZE, DEFAULT_MIN_TILE_SIZE)); - setMinMapSize(node.getInt(MIN_MAP_SIZE, DEFAULT_MIN_MAP_SIZE)); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSTileProvider.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSTileProvider.java deleted file mode 100644 index d1f7c9b64a..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/WMSTileProvider.java +++ /dev/null @@ -1,289 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms; - -import java.net.URI; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.mapviewer.AbstractTileProvider; -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.PixelConverter; -import org.jdesktop.swingx.mapviewer.TileProvider; - -import de.fhg.igd.mapviewer.server.LinearBoundsConverter; -import de.fhg.igd.mapviewer.server.wms.capabilities.Layer; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSBounds; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSCapabilities; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSCapabilitiesException; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSUtil; - -/** - * WMSTileProvider - * - * @author Simon Templer - * - * @version $Id$ - */ -public class WMSTileProvider extends AbstractTileProvider { - - private static final int EPSG_WGS84 = 4326; - - private static final Log log = LogFactory.getLog(WMSTileProvider.class); - - private static final Set SUPPORTED_FORMATS = new LinkedHashSet(); - - static { - SUPPORTED_FORMATS.add("image/png"); //$NON-NLS-1$ - SUPPORTED_FORMATS.add("image/jpeg"); //$NON-NLS-1$ - SUPPORTED_FORMATS.add("image/gif"); //$NON-NLS-1$ - } - - private final String serverUrl; - - private final int maxZoom; - private final int totalMapZoom; - private final String version; - private String format = null; - - private int epsg; - private double minX; - private double minY; - private double xRange; - private double yRange; - - private final int xTileSize; - private final int yTileSize; - - private String layerString; - - private final WMSCapabilities capabilities; - - /** - * Tile provider using WMS services - * - * @param baseUrl the base URL for the GetCapabilities request - * @param preferredEpsg the EPSG code of preferred SRS - * @param zoomLevels the number of zoom levels - * @param minTileSize the minimum tile size - * @param minMapSize the minimum map size - * @param layers the layers to display - * - * @throws WMSCapabilitiesException if reading the capabilities fails - */ - public WMSTileProvider(final String baseUrl, final int preferredEpsg, final int zoomLevels, - final int minTileSize, final int minMapSize, final String layers) - throws WMSCapabilitiesException { - - this.capabilities = WMSUtil.getCapabilities(baseUrl); - - // get server URL - String mapUrl = capabilities.getMapURL(); - - if (mapUrl.endsWith("?") || mapUrl.endsWith("&")) //$NON-NLS-1$ //$NON-NLS-2$ - serverUrl = mapUrl; - else if (mapUrl.indexOf('?') >= 0) - serverUrl = mapUrl + '&'; - else - serverUrl = mapUrl + '?'; - - log.info("GetMap URL: " + serverUrl); //$NON-NLS-1$ - - // get bounding box - WMSBounds bb = WMSUtil.getBoundingBox(capabilities, preferredEpsg); - - if (bb != null) { - // determine parameters from bounding box - try { - epsg = Integer.parseInt(bb.getSRS().substring(5)); - minX = bb.getMinX(); - xRange = bb.getMaxX() - minX; - minY = bb.getMinY(); - yRange = bb.getMaxY() - minY; - } catch (Exception e) { - // invalid bb - log.error("Invalid bounding box", e); //$NON-NLS-1$ - bb = null; - } - } - if (bb == null) { - // no bounding boxes -> world wms - log.warn("No valid bounding box found, creating world wms"); //$NON-NLS-1$ - // default tiles - epsg = EPSG_WGS84; - minX = -180; - xRange = 360; - minY = -90; - yRange = 180; - } - - log.info("Map bounds - epsg: " + epsg + ", minX: " + minX + ", xRange: " + xRange //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - + ", minY: " + minY + ", yRange: " + yRange); //$NON-NLS-1$ //$NON-NLS-2$ - - // determine tile sizes - double tileRatio = xRange / yRange; - if (tileRatio >= 1.0) { - // xRange is bigger - yTileSize = minTileSize; - xTileSize = (int) (tileRatio * yTileSize); - } - else { - // yRange is bigger - xTileSize = minTileSize; - yTileSize = (int) (xTileSize / tileRatio); - } - log.info("Tile size: " + xTileSize + "x" + yTileSize); //$NON-NLS-1$ //$NON-NLS-2$ - - // determine format - Iterable formats = capabilities.getFormats(); - Iterator itFormat = formats.iterator(); - while (format == null && itFormat.hasNext()) { - String f = itFormat.next(); - if (SUPPORTED_FORMATS.contains(f)) - format = f; - } - if (format == null) { - throw new WMSCapabilitiesException("No supported format found: " + formats); //$NON-NLS-1$ - } - - // zoom levels - maxZoom = zoomLevels - 1; - totalMapZoom = (int) (maxZoom - + (Math.log((double) minMapSize / (double) Math.max(xTileSize, yTileSize)) - / Math.log(2))); - - // version - version = capabilities.getVersion(); - - // layers - List layerList = WMSUtil.getLayers(layers, capabilities); - this.layerString = WMSUtil.getLayerString(layerList, true); - } - - /** - * @see AbstractTileProvider#createConverter() - */ - @Override - protected PixelConverter createConverter() { - // TODO values for swapAxes, reverseX, reverseY? - return new LinearBoundsConverter(GeotoolsConverter.getInstance(), this, minX, minY, xRange, - yRange, epsg, false, false, true); - } - - /** - * @see TileProvider#getDefaultZoom() - */ - @Override - public int getDefaultZoom() { - return maxZoom; - } - - /** - * @see TileProvider#getMapHeightInTiles(int) - */ - @Override - public int getMapHeightInTiles(int zoom) { - return 1 << (totalMapZoom - zoom); - } - - /** - * @see TileProvider#getMapWidthInTiles(int) - */ - @Override - public int getMapWidthInTiles(int zoom) { - return 1 << (totalMapZoom - zoom); - } - - /** - * @see TileProvider#getMaximumZoom() - */ - @Override - public int getMaximumZoom() { - return maxZoom; - } - - /** - * @see TileProvider#getMinimumZoom() - */ - @Override - public int getMinimumZoom() { - return 0; - } - - /** - * @see TileProvider#getTileHeight(int) - */ - @Override - public int getTileHeight(int zoom) { - return yTileSize; - } - - /** - * @see TileProvider#getTileUris(int, int, int) - */ - @Override - public URI[] getTileUris(int x, int y, int zoom) { - String styles = ""; //$NON-NLS-1$ - - double geoTileWidth = xRange / getMapWidthInTiles(zoom); - double geoTileHeight = yRange / getMapHeightInTiles(zoom); - - y = (getMapHeightInTiles(zoom) - 1) - y; // reverse y - - // Bounding Box needs lower left and upper right corner - double lx = minX + geoTileWidth * x; - double by = minY + geoTileHeight * y; - double rx = minX + geoTileWidth * (x + 1); - double ty = minY + geoTileHeight * (y + 1); - - String bbox = lx + "," + by + "," + rx + "," + ty; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - - // create query string - String url = serverUrl + "VERSION=" + version + "&REQUEST=" + //$NON-NLS-1$ //$NON-NLS-2$ - "GetMap&SERVICE=WMS&Layers=" + layerString + //$NON-NLS-1$ - "&FORMAT=" + format + //$NON-NLS-1$ - "&BBOX=" + bbox + //$NON-NLS-1$ - "&WIDTH=" + xTileSize + "&HEIGHT=" + yTileSize + //$NON-NLS-1$ //$NON-NLS-2$ - "&SRS=EPSG:" + epsg + //$NON-NLS-1$ - "&STYLES=" + styles + //$NON-NLS-1$ - "&TRANSPARENT=FALSE" + //$NON-NLS-1$ - // "&BGCOLOR=0xffffff" + - "&EXCEPTIONS=application/vnd.ogc.se_inimage" + //$NON-NLS-1$ - ""; //$NON-NLS-1$ - - return new URI[] { URI.create(url) }; - } - - /** - * @see TileProvider#getTileWidth(int) - */ - @Override - public int getTileWidth(int zoom) { - return xTileSize; - } - - /** - * @see TileProvider#getTotalMapZoom() - */ - @Override - public int getTotalMapZoom() { - return totalMapZoom; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/Layer.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/Layer.java deleted file mode 100644 index a9a9813963..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/Layer.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.capabilities; - -/** - * Layer - * - * @author Simon Templer - * - * @version $Id$ - */ -public class Layer { - - private String name; - - private String displayName; - - private String description; - - private boolean selected = true; - - /** - * Constructor - * - * @param name the map name - * @param displayName the display name - * @param description the description - */ - public Layer(String name, String displayName, String description) { - super(); - this.name = name; - this.displayName = displayName; - this.description = description; - } - - /** - * @return the selected - */ - public boolean isSelected() { - return selected; - } - - /** - * @param selected the selected to set - */ - public void setSelected(boolean selected) { - this.selected = selected; - } - - /** - * @return the name - */ - public String getName() { - return name; - } - - /** - * @return the displayName - */ - public String getDisplayName() { - if (displayName == null) - return name; - else - return displayName; - } - - /** - * @return the description - */ - public String getDescription() { - return description; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/WMSBounds.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/WMSBounds.java deleted file mode 100644 index 211902695d..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/WMSBounds.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.capabilities; - -/** - * WMS Layer Bounding Box - * - * @author Simon Templer - */ -public class WMSBounds { - - private final String srs; - - private final double minx; - - private final double miny; - - private final double maxx; - - private final double maxy; - - /** - * Constructor - * - * @param srs the string representation of the SRS - * @param minx the minimum x ordinate - * @param miny the minimum y ordinate - * @param maxx the maximum x ordinate - * @param maxy the maximum y ordinate - */ - public WMSBounds(String srs, double minx, double miny, double maxx, double maxy) { - this.minx = minx; - this.miny = miny; - this.maxx = maxx; - this.maxy = maxy; - - this.srs = srs; - } - - /** - * @return the srs - */ - public String getSRS() { - return srs; - } - - /** - * @return the minx - */ - public double getMinX() { - return minx; - } - - /** - * @return the miny - */ - public double getMinY() { - return miny; - } - - /** - * @return the maxx - */ - public double getMaxX() { - return maxx; - } - - /** - * @return the maxy - */ - public double getMaxY() { - return maxy; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/WMSCapabilities.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/WMSCapabilities.java deleted file mode 100644 index d5aca8fd93..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/WMSCapabilities.java +++ /dev/null @@ -1,352 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.capabilities; - -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.Proxy; -import java.net.URI; -import java.net.URLConnection; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathFactory; - -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; - -import eu.esdihumboldt.util.http.ProxyUtil; - -/** - * WMS capabilities - * - * @author Simon Templer - */ -public class WMSCapabilities { - - private static final DocumentBuilderFactory builderFactory = DocumentBuilderFactory - .newInstance(); - - private static final XPathFactory xpathFactory = XPathFactory.newInstance(); - - private final String version; - - private final String title; - - private final String mapURL; - - private final Set formats = new LinkedHashSet(); - - private final Set exceptionFormats = new LinkedHashSet(); - - private final Set supportedSRS = new LinkedHashSet(); - - private final Map boundingBoxes = new HashMap(); - - private final List layers = new ArrayList(); - - /** - * Constructor - * - * @param capabilitiesURI the URI of the capabilities document - * - * @throws WMSCapabilitiesException if loading the capabilities failed - */ - private WMSCapabilities(URI capabilitiesURI) throws WMSCapabilitiesException { - Document document; - try { - document = getDocument(capabilitiesURI); - } catch (Exception e) { - throw new WMSCapabilitiesException(e.getLocalizedMessage(), e); - } - - XPath xpath = xpathFactory.newXPath(); - - try { - // [version] states the WMS version the corresponding code is - // compatible to (may be incomplete) - - // only mandatory tags will be evaluated (exceptions: Layer) - - // get main node [1.1.1] - Node main = ((NodeList) xpath.evaluate("WMT_MS_Capabilities", document, //$NON-NLS-1$ - XPathConstants.NODESET)).item(0); - - // determine version [1.1.1] - version = main.getAttributes().getNamedItem("version").getTextContent(); //$NON-NLS-1$ - - // determine title [1.1.1] - Node titleNode = ((NodeList) xpath.evaluate("WMT_MS_Capabilities/Service/Title", //$NON-NLS-1$ - document, XPathConstants.NODESET)).item(0); - title = titleNode.getTextContent(); - - // GetMap capability - - // GetMap formats [1.1.1] - NodeList mapFormats = (NodeList) xpath.evaluate( - "WMT_MS_Capabilities/Capability/Request/GetMap/Format", //$NON-NLS-1$ - document, XPathConstants.NODESET); - - for (int i = 0; i < mapFormats.getLength(); i++) { - Node formatNode = mapFormats.item(i); - formats.add(formatNode.getTextContent()); - } - - // GetMap URL [1.1.1], assumes there is a HTTP/Get URL given in the - // document - NodeList urlNodes = (NodeList) xpath.evaluate( - "WMT_MS_Capabilities/Capability/Request/GetMap/DCPType/HTTP/Get/OnlineResource", //$NON-NLS-1$ - document, XPathConstants.NODESET); - - if (urlNodes.getLength() > 0) { - mapURL = urlNodes.item(0).getAttributes().getNamedItem("xlink:href") //$NON-NLS-1$ - .getTextContent(); - } - else { - throw new WMSCapabilitiesException( - "No HTTP Get URL defined for the GetMap request"); //$NON-NLS-1$ - } - - // Exception formats [1.1.1] - NodeList exceptions = (NodeList) xpath.evaluate( - "WMT_MS_Capabilities/Capability/Exception/Format", //$NON-NLS-1$ - document, XPathConstants.NODESET); - - for (int i = 0; i < exceptions.getLength(); i++) { - Node formatNode = exceptions.item(i); - exceptionFormats.add(formatNode.getTextContent()); - } - - // Layer - - // Layer SRS [1.1.1] - NodeList srsNodes = (NodeList) xpath.evaluate( - "WMT_MS_Capabilities/Capability/Layer/SRS", //$NON-NLS-1$ - document, XPathConstants.NODESET); - - for (int i = 0; i < srsNodes.getLength(); i++) { - Node srsNode = srsNodes.item(i); - String srsText = srsNode.getTextContent(); - Pattern pattern = Pattern.compile("[Ee][Pp][Ss][Gg]:\\d*"); - Matcher matcher = pattern.matcher(srsText); - while (matcher.find()) { - String srs = matcher.group(); - srs = "EPSG:" + srs.substring(5); - supportedSRS.add(srs); - } - // supportedSRS.add(srsNode.getTextContent()); - } - - // Layer Bounding Boxes [1.1.1] - NodeList bbNodes = (NodeList) xpath.evaluate( - "WMT_MS_Capabilities/Capability/Layer/BoundingBox", //$NON-NLS-1$ - document, XPathConstants.NODESET); - - for (int i = 0; i < bbNodes.getLength(); i++) { - Node bbNode = bbNodes.item(i); - String srs = bbNode.getAttributes().getNamedItem("SRS").getTextContent(); //$NON-NLS-1$ - WMSBounds box = new WMSBounds(srs, - Double.parseDouble( - bbNode.getAttributes().getNamedItem("minx").getTextContent()), //$NON-NLS-1$ - Double.parseDouble( - bbNode.getAttributes().getNamedItem("miny").getTextContent()), //$NON-NLS-1$ - Double.parseDouble( - bbNode.getAttributes().getNamedItem("maxx").getTextContent()), //$NON-NLS-1$ - Double.parseDouble( - bbNode.getAttributes().getNamedItem("maxy").getTextContent()) //$NON-NLS-1$ - ); - boundingBoxes.put(srs, box); - } - - // WGS84 bounding box - if (!boundingBoxes.containsKey("EPSG:4326")) { //$NON-NLS-1$ - NodeList llNodes = (NodeList) xpath.evaluate( - "WMT_MS_Capabilities/Capability/Layer/LatLonBoundingBox", //$NON-NLS-1$ - document, XPathConstants.NODESET); - - if (llNodes.getLength() > 0) { - Node bbNode = llNodes.item(0); - String srs = "EPSG:4326"; //$NON-NLS-1$ - WMSBounds box = new WMSBounds(srs, - Double.parseDouble( - bbNode.getAttributes().getNamedItem("minx").getTextContent()), //$NON-NLS-1$ - Double.parseDouble( - bbNode.getAttributes().getNamedItem("miny").getTextContent()), //$NON-NLS-1$ - Double.parseDouble( - bbNode.getAttributes().getNamedItem("maxx").getTextContent()), //$NON-NLS-1$ - Double.parseDouble( - bbNode.getAttributes().getNamedItem("maxy").getTextContent()) //$NON-NLS-1$ - ); - boundingBoxes.put(srs, box); - } - } - - // Layers [1.1.1] - NodeList layerNodes = (NodeList) xpath.evaluate( - "WMT_MS_Capabilities/Capability/Layer/Layer", //$NON-NLS-1$ - document, XPathConstants.NODESET); - - for (int i = 0; i < layerNodes.getLength(); i++) { - Node layerNode = layerNodes.item(i); - NodeList children = layerNode.getChildNodes(); - - String name = null; - String title = null; - String description = null; - - for (int j = 0; j < children.getLength(); j++) { - Node child = children.item(j); - - String nodeName = child.getNodeName(); - - if (nodeName.equals("Name")) { //$NON-NLS-1$ - name = child.getTextContent(); - } - else if (nodeName.equals("Title")) { //$NON-NLS-1$ - title = child.getTextContent(); - } - else if (nodeName.equals("Abstract")) { //$NON-NLS-1$ - description = child.getTextContent(); - } - } - - if (name != null) { - Layer layer = new Layer(name, title, description); - layers.add(layer); - } - } - } catch (WMSCapabilitiesException e) { - throw e; - } catch (Exception e) { - throw new WMSCapabilitiesException("Document is no valid WMS Capabilities document", e); //$NON-NLS-1$ - } - } - - /** - * Load an XML document form an URI - * - * @param uri the URI - * @return the XML document if loading was successful - * @throws ParserConfigurationException if an error occurred configuring the - * document parser - * @throws IOException if an error occurred reading the document - * @throws MalformedURLException if creating an URL from the given URI fails - */ - private static Document getDocument(URI uri) - throws ParserConfigurationException, MalformedURLException, IOException { - builderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); - builderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false); - builderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false); - builderFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", - false); - builderFactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); - - DocumentBuilder builder = builderFactory.newDocumentBuilder(); - Proxy proxy = ProxyUtil.findProxy(uri); - URLConnection connection = uri.toURL().openConnection(proxy); - - // Ensure the input stream is closed properly - try (InputStream inputStream = connection.getInputStream()) { - return builder.parse(inputStream); - } catch (IOException | SAXException e) { - // Handle exceptions related to input stream and XML parsing - throw new IOException("Error parsing the document from the URI: " + uri, e); - } - } - - /** - * Get the capabilities of a WMS service - * - * @param capabilitiesURI the URI of the capabilities document - * @return the WMS capabilities - * - * @throws WMSCapabilitiesException if reading the capabilities failed - */ - public static WMSCapabilities getCapabilities(URI capabilitiesURI) - throws WMSCapabilitiesException { - return new WMSCapabilities(capabilitiesURI); - } - - /** - * @return the version - */ - public String getVersion() { - return version; - } - - /** - * @return the title - */ - public String getTitle() { - return title; - } - - /** - * @return the mapURL - */ - public String getMapURL() { - return mapURL; - } - - /** - * @return the formats - */ - public Set getFormats() { - return formats; - } - - /** - * @return the exceptionFormats - */ - public Set getExceptionFormats() { - return exceptionFormats; - } - - /** - * @return the supportedSRS - */ - public Set getSupportedSRS() { - return supportedSRS; - } - - /** - * @return the boundingBoxes - */ - public Map getBoundingBoxes() { - return boundingBoxes; - } - - /** - * @return the layers - */ - public List getLayers() { - return layers; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/WMSCapabilitiesException.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/WMSCapabilitiesException.java deleted file mode 100644 index 7b40ec7ab4..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/WMSCapabilitiesException.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.capabilities; - -/** - * WMSCapabilitiesException - * - * @author Simon Templer - * - * @version $Id$ - */ -public class WMSCapabilitiesException extends Exception { - - private static final long serialVersionUID = -9159220304576993113L; - - /** - * @see Exception#Exception() - */ - public WMSCapabilitiesException() { - super(); - } - - /** - * @see Exception#Exception(String) - */ - public WMSCapabilitiesException(String arg0) { - super(arg0); - } - - /** - * @see Exception#Exception(Throwable) - */ - public WMSCapabilitiesException(Throwable arg0) { - super(arg0); - } - - /** - * @see Exception#Exception(String, Throwable) - */ - public WMSCapabilitiesException(String arg0, Throwable arg1) { - super(arg0, arg1); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/WMSUtil.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/WMSUtil.java deleted file mode 100644 index d84bee732b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/capabilities/WMSUtil.java +++ /dev/null @@ -1,302 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.capabilities; - -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; - -import de.fhg.igd.mapviewer.server.wms.Messages; -import de.fhg.igd.mapviewer.server.wms.WMSConfiguration; - -/** - * WMS utility methods - * - * @author Simon Templer - */ -public abstract class WMSUtil { - - private static final Log log = LogFactory.getLog(WMSUtil.class); - - /** - * Get the URI for a GetMap request - * - * @param capabilities the WMS capabilities - * @param configuration the configuration - * @param width the image width - * @param height the image height - * @param bounds the map bounds - * @param styles the styles - * @param format the format - * @param transparent if a transparent background shall be used - * @return the GetMap URI - */ - public static URI getMapURI(WMSCapabilities capabilities, WMSConfiguration configuration, - int width, int height, WMSBounds bounds, String styles, String format, - boolean transparent) { - if (styles == null) - styles = ""; //$NON-NLS-1$ - if (format == null) { - format = "image/png"; // FIXME //$NON-NLS-1$ - } - - // get server URL - String serverUrl; - String mapUrl = capabilities.getMapURL(); - - if (mapUrl.endsWith("?") || mapUrl.endsWith("&")) //$NON-NLS-1$ //$NON-NLS-2$ - serverUrl = mapUrl; - else if (mapUrl.indexOf('?') >= 0) - serverUrl = mapUrl + '&'; - else - serverUrl = mapUrl + '?'; - - List layerList = getLayers(configuration.getLayers(), capabilities); - String layers = getLayerString(layerList, true); - - // create query string - String url = serverUrl + "VERSION=" + capabilities.getVersion() + "&REQUEST=" + //$NON-NLS-1$ //$NON-NLS-2$ - "GetMap&SERVICE=WMS&Layers=" + layers + //$NON-NLS-1$ - "&FORMAT=" + format + //$NON-NLS-1$ - "&BBOX=" + bounds.getMinX() + "," + bounds.getMinY() + "," + bounds.getMaxX() + "," //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ - + bounds.getMaxY() + "&WIDTH=" + width + "&HEIGHT=" + height + //$NON-NLS-2$ - "&SRS=" + bounds.getSRS() + //$NON-NLS-1$ - "&STYLES=" + styles + //$NON-NLS-1$ - "&TRANSPARENT=" + ((transparent) ? ("TRUE") : ("FALSE")) + //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - // "&BGCOLOR=0xffffff" + - "&EXCEPTIONS=application/vnd.ogc.se_inimage" + //$NON-NLS-1$ - ""; //$NON-NLS-1$ - - return URI.create(url); - } - - /** - * Get the preferred bounding box. Tries to convert the bounding box if not - * found with the preferred SRS - * - * @param capabilities the WMS capabilities - * @param preferredEpsg the preferred EPSG code - * @return the preferred bounding box, an available bounding box or - * null if none is available - */ - public static WMSBounds getBoundingBox(WMSCapabilities capabilities, int preferredEpsg) { - WMSBounds bounds = getPreferredBoundingBox(capabilities, preferredEpsg); - String srs = "EPSG:" + preferredEpsg; - - if (bounds.getSRS().equals(srs)) { - // matches preferred SRS - return bounds; - } - else { - try { - // try to convert the bounding box to the preferred SRS - int boxEpsg = Integer.parseInt(bounds.getSRS().substring(5)); - - GeoPosition topLeft = new GeoPosition(bounds.getMinX(), bounds.getMinY(), boxEpsg); - GeoPosition bottomRight = new GeoPosition(bounds.getMaxX(), bounds.getMaxY(), - boxEpsg); - - topLeft = GeotoolsConverter.getInstance().convert(topLeft, preferredEpsg); - bottomRight = GeotoolsConverter.getInstance().convert(bottomRight, preferredEpsg); - - return new WMSBounds(srs, Math.min(topLeft.getX(), bottomRight.getX()), - Math.min(topLeft.getY(), bottomRight.getY()), - Math.max(topLeft.getX(), bottomRight.getX()), - Math.max(topLeft.getY(), bottomRight.getY())); - } catch (Exception e) { - // fall back to bounds - return bounds; - } - } - } - - /** - * Get the preferred bounding box - * - * @param capabilities the WMS capabilities - * @param preferredEpsg the preferred EPSG code - * @return the preferred bounding box, an available bounding box or - * null - */ - private static WMSBounds getPreferredBoundingBox(WMSCapabilities capabilities, - int preferredEpsg) { - // get bounding boxes - Map bbs = capabilities.getBoundingBoxes(); - - WMSBounds bb = null; - - if (!bbs.isEmpty()) { - // bounding box present - if (preferredEpsg != 0) { - bb = bbs.get("EPSG:" + preferredEpsg); //$NON-NLS-1$ - } - - if (bb != null) { - // log.info("Found bounding box for preferred srs"); - // //$NON-NLS-1$ - } - else { - Iterator itBB = bbs.values().iterator(); - - while (bb == null && itBB.hasNext()) { - WMSBounds temp = itBB.next(); - - if (temp.getSRS().startsWith("EPSG:") //$NON-NLS-1$ - ) {// && - // capabilities.getSupportedSRS().contains(temp.getSRS())) - // { - bb = temp; - // log.info("Found epsg bounding box"); //$NON-NLS-1$ - } - } - } - } - return bb; - } - - /** - * Get WMS capabilities - * - * @param baseUrl the base URL of the WMS - * @return the WMS capabilities - * - * @throws WMSCapabilitiesException if reading the capabilities fails - */ - public static WMSCapabilities getCapabilities(String baseUrl) throws WMSCapabilitiesException { - try { - // try getting capabilities directly from the given URL - return WMSCapabilities.getCapabilities(URI.create(baseUrl)); - } catch (Exception e) { - // add parameters to the URL and try again - String capabilitiesUrl; - if (baseUrl.endsWith("?") || baseUrl.endsWith("&")) //$NON-NLS-1$ //$NON-NLS-2$ - capabilitiesUrl = baseUrl; - else if (baseUrl.indexOf('?') >= 0) - capabilitiesUrl = baseUrl + '&'; - else - capabilitiesUrl = baseUrl + '?'; - - // add default version parameter - if (!capabilitiesUrl.matches(".*\\?.*[Vv][Ee][Rr][Ss][Ii][Oo][Nn]=.*")) { //$NON-NLS-1$ - capabilitiesUrl += "VERSION=1.1.1&"; //$NON-NLS-1$ - } - // add request parameter - if (!capabilitiesUrl.matches(".*\\?.*[Rr][Ee][Qq][Uu][Ee][Ss][Tt]=.*")) { //$NON-NLS-1$ - capabilitiesUrl += "REQUEST=GetCapabilities&"; //$NON-NLS-1$ - } - // add service parameter - if (!capabilitiesUrl.matches(".*\\?.*[Ss][Ee][Rr][Vv][Ii][Cc][Ee]=.*")) { //$NON-NLS-1$ - capabilitiesUrl += "SERVICE=WMS&"; //$NON-NLS-1$ - } - - if (capabilitiesUrl.endsWith("&")) { //$NON-NLS-1$ - capabilitiesUrl = capabilitiesUrl.substring(0, capabilitiesUrl.length() - 1); - } - - log.info("GetCapabilities URL: " + capabilitiesUrl); //$NON-NLS-1$ - - try { - URI uri = URI.create(capabilitiesUrl); - return WMSCapabilities.getCapabilities(uri); - } catch (IllegalArgumentException e1) { - throw new WMSCapabilitiesException(Messages.WMSUtil_8); - } catch (WMSCapabilitiesException e1) { - throw e1; - } catch (Exception e1) { - throw new WMSCapabilitiesException(Messages.WMSUtil_9); - } - } - } - - /** - * Get the WMS layers - * - * @param layerString the layer string - * @param capabilities the WMS capabilities - * @return the list of layers - */ - public static List getLayers(String layerString, WMSCapabilities capabilities) { - // determine layers to show - List showLayers = null; - if (layerString != null && !layerString.isEmpty()) { - String[] layers = layerString.split(","); //$NON-NLS-1$ - showLayers = new ArrayList(); - for (String layer : layers) { - showLayers.add(layer); - } - } - - List layers = new ArrayList(); - - for (Layer layer : capabilities.getLayers()) { - if (showLayers != null) { - try { - layer.setSelected(showLayers.contains(layer.getName()) - || showLayers.contains(URLEncoder.encode(layer.toString(), "UTF-8"))); //$NON-NLS-1$ - } catch (UnsupportedEncodingException e) { - log.warn("Unsupported encoding", e); //$NON-NLS-1$ - } - } - - layers.add(layer); - } - - return layers; - } - - /** - * Get the string representation for the given layers - * - * @param layers the list of layers - * @param encode if the layer string shall be encoded - * @return the layers string - */ - public static String getLayerString(List layers, boolean encode) { - StringBuilder layBuf = new StringBuilder(); - boolean init = true; - - for (Layer layer : layers) { - if (layer.isSelected()) { - if (!init) - layBuf.append(','); - else - init = false; - - try { - if (encode) { - layBuf.append(URLEncoder.encode(layer.getName(), "UTF-8")); //$NON-NLS-1$ - } - else { - layBuf.append(layer.getName()); - } - } catch (UnsupportedEncodingException e) { - log.error("Could not add layer " + layer.getName(), e); //$NON-NLS-1$ - } - } - } - - return layBuf.toString(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/messages.properties b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/messages.properties deleted file mode 100644 index bef9425c70..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/messages.properties +++ /dev/null @@ -1,22 +0,0 @@ -SRSConfigurationPage_0=Any SRS -SRSConfigurationPage_2=Spatial reference system -SRSConfigurationPage_3=Choose the spatial reference system to use -TileConfigurationPage_0=Tiles -TileConfigurationPage_1=Tiles -TileConfigurationPage_2=Configure the map tiles. -TileConfigurationPage_3=Number of zoom levels for the map -TileConfigurationPage_4=Number of zoom levels -TileConfigurationPage_5=Minimum width/height for a tile -TileConfigurationPage_6=Minimum tile size (px) -TileConfigurationPage_7=Minimum width/height of the map at the smallest scale -TileConfigurationPage_8=Minimum map size (px) -WMSMapServerFactory_3=WMS maps -WMSTileOverlay_0=Cannot show WMS overlay -WMSTileOverlay_1=.\nThe current map doesn't support WMS overlays. -WMSTileOverlay_2=Cannot show WMS overlay -WMSTileOverlay_3=.\nThe overlay only supports the following reference systems: -WMSTileOverlay_5=WMS overlay -WMSTileOverlayCollection_1=WMS overlays -WMSUtil_10=Error getting WMS capabilities -WMSUtil_8=Invalid URL -WMSUtil_9=Accessing the service URL failed diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/messages_de.properties b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/messages_de.properties deleted file mode 100644 index 40ba61930c..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/messages_de.properties +++ /dev/null @@ -1,23 +0,0 @@ -SRSConfigurationPage_0=Beliebiges Bezugssystem -SRSConfigurationPage_2=Räumliches Bezugssystem -SRSConfigurationPage_3=Wählen Sie das zu verwendende räumliche Bezugssystem -TileConfigurationPage_0=Kacheln -TileConfigurationPage_1=Kacheln -TileConfigurationPage_2=Optionen zum Kacheln der Karte -TileConfigurationPage_3=Anzahl der Zoom-Stufen -TileConfigurationPage_4=Anzahl der Zoom-Stufen -TileConfigurationPage_5=Minimale Breite/Höhe einer Kachel (in Pixeln) -TileConfigurationPage_6=Minimale Kachelgröße (px) -TileConfigurationPage_7=Minimale Breite/Höhe der Karte im kleinsten Maßstab (in Pixeln) -TileConfigurationPage_8=Minimale Kartengröße (px) -WMSMapServerFactory_3=WMS Karten -WMSTileOverlay_0=WMS Overlay kann nicht angzeigt werden: -WMSTileOverlay_1=\nDie aktuelle Karte unterstützt keine WMS Overlays. -WMSTileOverlay_2=WMS Overlay kann nicht angzeigt werden: -WMSTileOverlay_3=\nDas Overlay unterstützt nur die folgenden Referenzsysteme: -WMSTileOverlay_5=WMS Overlay -WMSTileOverlayCollection_1=WMS Overlays -WMSUtil_10=Fehler beim Parsen der WMS Capabilities -WMSUtil_8=Ungültige URL -WMSUtil_9=Zugriff auf die Service URL fehlgeschlagen - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/overlay/WMSTileOverlay.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/overlay/WMSTileOverlay.java deleted file mode 100644 index f28e73ae35..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/overlay/WMSTileOverlay.java +++ /dev/null @@ -1,332 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.overlay; - -import java.awt.AlphaComposite; -import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.image.BufferedImage; -import java.io.InputStream; -import java.net.Proxy; -import java.net.URI; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.prefs.BackingStoreException; -import java.util.prefs.Preferences; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.graphics.GraphicsUtilities; -import org.jdesktop.swingx.mapviewer.GeoConverter; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.PixelConverter; - -import de.fhg.igd.geom.BoundingBox; -import de.fhg.igd.mapviewer.AbstractTileOverlayPainter; -import de.fhg.igd.mapviewer.MapKitTileOverlayPainter; -import de.fhg.igd.mapviewer.server.wms.Messages; -import de.fhg.igd.mapviewer.server.wms.WMSConfiguration; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSBounds; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSCapabilities; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSCapabilitiesException; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSUtil; - -import eu.esdihumboldt.util.http.ProxyUtil; - -/** - * Tile overlay displaying WMS data - * - * @author Simon Templer - */ -public class WMSTileOverlay extends MapKitTileOverlayPainter { - - private static final Log log = LogFactory.getLog(WMSTileOverlay.class); - - /** - * The preferences - */ - private static final Preferences PREF_OVERLAYS = Preferences - .userNodeForPackage(WMSTileOverlay.class).node("overlays"); //$NON-NLS-1$ - - private static final Set supportedFormats = new LinkedHashSet(); - - static { - // order is important, png is preferred - supportedFormats.add("image/png"); //$NON-NLS-1$ - supportedFormats.add("image/gif"); //$NON-NLS-1$ - supportedFormats.add("image/jpeg"); //$NON-NLS-1$ - } - - private PixelConverter lastConverter = null; - - /** - * The WMS client configuration - */ - private final WMSConfiguration configuration = new WMSConfiguration() { - - @Override - protected Preferences getPreferences() { - return PREF_OVERLAYS; - } - }; - - private volatile WMSCapabilities capabilities = null; - - /** - * Default constructor - */ - public WMSTileOverlay() { - super(4); - } - - /** - * Constructor - * - * @param name the configuration name - */ - public WMSTileOverlay(String name) { - this(); - - if (!configuration.load(name)) { - throw new IllegalArgumentException("Error loading WMS configuration"); //$NON-NLS-1$ - } - } - - /** - * @return the configuration - */ - public WMSConfiguration getConfiguration() { - return configuration; - } - - /** - * @see AbstractTileOverlayPainter#getMaxOverlap() - */ - @Override - protected int getMaxOverlap() { - // no overlapping - return 0; - } - - /** - * @see AbstractTileOverlayPainter#repaintTile(int, int, int, int, - * PixelConverter, int) - */ - @Override - public BufferedImage repaintTile(int posX, int posY, int width, int height, - PixelConverter converter, int zoom) { - // the first converter isn't regarded as a new converter because it's - // always the empty map - boolean isNewConverter = lastConverter != null && !converter.equals(lastConverter); - lastConverter = converter; - - if (!converter.supportsBoundingBoxes()) { - if (isNewConverter) { - handleError(Messages.WMSTileOverlay_0 + configuration.getName() - + Messages.WMSTileOverlay_1); - } - return null; - } - - synchronized (this) { - if (capabilities == null) { - try { - capabilities = WMSUtil.getCapabilities(configuration.getBaseUrl()); - } catch (WMSCapabilitiesException e) { - log.error("Error getting WMS capabilities"); //$NON-NLS-1$ - } - } - } - - if (capabilities != null) { - int mapEpsg = converter.getMapEpsg(); - - WMSBounds box; - synchronized (this) { - if (capabilities.getSupportedSRS().contains("EPSG:" + mapEpsg)) { //$NON-NLS-1$ - // same SRS supported - } - else { - // SRS not supported - if (isNewConverter) { - StringBuilder message = new StringBuilder(); - message.append(Messages.WMSTileOverlay_2); - message.append(configuration.getName()); - message.append(Messages.WMSTileOverlay_3); - boolean init = true; - for (String srs : capabilities.getSupportedSRS()) { - if (init) { - init = false; - } - else { - message.append(", "); //$NON-NLS-1$ - } - message.append(srs); - } - handleError(message.toString()); - } - return null; - } - - box = WMSUtil.getBoundingBox(capabilities, mapEpsg); - } - - String srs = box.getSRS(); - - if (srs.startsWith("EPSG:")) { //$NON-NLS-1$ - // determine format - String format = null; - Iterator itFormat = supportedFormats.iterator(); - synchronized (this) { - while (format == null && itFormat.hasNext()) { - String supp = itFormat.next(); - if (capabilities.getFormats().contains(supp)) { - format = supp; - } - } - } - if (format == null) { - // no compatible format - return null; - } - - try { - // check if tile lies within the bounding box - int epsg = Integer.parseInt(srs.substring(5)); - - GeoPosition topLeft = converter.pixelToGeo(new Point(posX, posY), zoom); - GeoPosition bottomRight = converter - .pixelToGeo(new Point(posX + width, posY + height), zoom); - - // WMS bounding box - BoundingBox wms = new BoundingBox(box.getMinX(), box.getMinY(), -1, - box.getMaxX(), box.getMaxY(), 1); - - GeoConverter geotools = GeotoolsConverter.getInstance(); - GeoPosition bbTopLeft = geotools.convert(topLeft, epsg); - GeoPosition bbBottomRight = geotools.convert(bottomRight, epsg); - - double minX = Math.min(bbTopLeft.getX(), bbBottomRight.getX()); - double minY = Math.min(bbTopLeft.getY(), bbBottomRight.getY()); - double maxX = Math.max(bbTopLeft.getX(), bbBottomRight.getX()); - double maxY = Math.max(bbTopLeft.getY(), bbBottomRight.getY()); - - BoundingBox tile = new BoundingBox(minX, minY, -1, maxX, maxY, 1); - - // check if bounding box and tile overlap - if (wms.intersectsOrCovers(tile) || tile.covers(wms)) { - WMSBounds bounds; - if (epsg == mapEpsg) { - bounds = new WMSBounds(srs, minX, minY, maxX, maxY); - } - else { - // determine bounds for request - minX = Math.min(topLeft.getX(), bottomRight.getX()); - minY = Math.min(topLeft.getY(), bottomRight.getY()); - maxX = Math.max(topLeft.getX(), bottomRight.getX()); - maxY = Math.max(topLeft.getY(), bottomRight.getY()); - bounds = new WMSBounds("EPSG:" + mapEpsg, minX, minY, maxX, maxY); //$NON-NLS-1$ - } - - URI uri; - synchronized (this) { - uri = WMSUtil.getMapURI(capabilities, configuration, width, height, - bounds, null, format, true); - } - - Proxy proxy = ProxyUtil.findProxy(uri); - - InputStream in = uri.toURL().openConnection(proxy).getInputStream(); - - BufferedImage image = GraphicsUtilities.loadCompatibleImage(in); - - // apply transparency to the image - BufferedImage result = GraphicsUtilities.createCompatibleTranslucentImage( - image.getWidth(), image.getHeight()); - Graphics2D g = result.createGraphics(); - try { - AlphaComposite ac = AlphaComposite.getInstance(AlphaComposite.SRC, - 0.5f); - g.setComposite(ac); - g.drawImage(image, 0, 0, null); - } finally { - g.dispose(); - } - - return result; - } - } catch (Throwable e) { - log.warn("Error painting WMS overlay", e); //$NON-NLS-1$ - } - } - } - - return null; - } - - /** - * Handle errors messages - * - * @param message the error message - */ - private void handleError(final String message) { - final Display display = PlatformUI.getWorkbench().getDisplay(); - - display.asyncExec(new Runnable() { - - @Override - public void run() { - MessageDialog.openWarning(display.getActiveShell(), Messages.WMSTileOverlay_5, - message); - } - }); - } - - /** - * Remove the configuration with the given name - * - * @param name the name - * - * @return if removing the configuration succeeded - */ - public static boolean removeConfiguration(String name) { - try { - PREF_OVERLAYS.node(name).removeNode(); - return true; - } catch (BackingStoreException e) { - log.error("Error removing configuration " + name, e); //$NON-NLS-1$ - return false; - } - } - - /** - * Get the names of the existing configurations - * - * @return the configuration names - */ - public static String[] getConfigurationNames() { - try { - return PREF_OVERLAYS.childrenNames(); - } catch (BackingStoreException e) { - return new String[] {}; - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/overlay/WMSTileOverlayCollection.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/overlay/WMSTileOverlayCollection.java deleted file mode 100644 index a8bd248018..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/overlay/WMSTileOverlayCollection.java +++ /dev/null @@ -1,240 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.overlay; - -import java.util.LinkedList; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; - -import de.fhg.igd.eclipse.util.extension.AbstractObjectFactory; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection; -import de.fhg.igd.mapviewer.AbstractTileOverlayPainter; -import de.fhg.igd.mapviewer.server.wms.Messages; -import de.fhg.igd.mapviewer.server.wms.WMSConfiguration; -import de.fhg.igd.mapviewer.server.wms.wizard.WMSConfigurationWizard; -import de.fhg.igd.mapviewer.view.overlay.TileOverlayFactory; -import de.fhg.igd.mapviewer.view.overlay.TileOverlayFactoryCollection; - -/** - * Collection of {@link WMSTileOverlay} factories - * - * @author Simon Templer - */ -public class WMSTileOverlayCollection implements TileOverlayFactoryCollection { - - /** - * Factory for {@link WMSTileOverlay}s - */ - public class OverlayFactory extends AbstractObjectFactory - implements TileOverlayFactory { - - private final String name; - - /** - * Constructor - * - * @param name the WMS overlay name - */ - public OverlayFactory(String name) { - super(); - - this.name = name; - } - - /** - * @see ExtensionObjectFactory#createExtensionObject() - */ - @Override - public TileOverlayPainter createExtensionObject() throws Exception { - WMSTileOverlay result = new WMSTileOverlay(name); - result.setPriority(priority); - return result; - } - - /** - * @see ExtensionObjectDefinition#getDisplayName() - */ - @Override - public String getDisplayName() { - return name; - } - - /** - * @see ExtensionObjectDefinition#getIdentifier() - */ - @Override - public String getIdentifier() { - return getTypeName() + ":" + getDisplayName(); //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectDefinition#getTypeName() - */ - @Override - public String getTypeName() { - return WMSTileOverlay.class.getName(); - } - - /** - * @see AbstractObjectFactory#allowConfigure() - */ - @Override - public boolean allowConfigure() { - return true; - } - - /** - * @see AbstractObjectFactory#configure() - */ - @Override - public boolean configure() { - try { - WMSTileOverlay server = (WMSTileOverlay) createExtensionObject(); - return WMSTileOverlayCollection.this.configure(server, true); - } catch (Exception e) { - return false; - } - } - - /** - * @see ExtensionObjectFactory#dispose(Object) - */ - @Override - public void dispose(TileOverlayPainter instance) { - instance.dispose(); - } - - /** - * @see TileOverlayFactory#showInMiniMap() - */ - @Override - public boolean showInMiniMap() { - return true; - } - - } - - private static final Log log = LogFactory.getLog(WMSTileOverlayCollection.class); - - private int priority = AbstractTileOverlayPainter.DEF_PRIORITY; - - /** - * @see ExtensionObjectFactoryCollection#addNew() - */ - @Override - public TileOverlayFactory addNew() { - WMSTileOverlay overlay = new WMSTileOverlay(); - - if (configure(overlay, false)) { - return new OverlayFactory(overlay.getConfiguration().getName()); - } - else { - return null; - } - } - - /** - * Configure the given overlay - * - * @param overlay the overlay - * @param overwrite if the configuration may be overridden - * @return if the configuration was saved - */ - private boolean configure(WMSTileOverlay overlay, boolean overwrite) { - WMSConfiguration configuration = overlay.getConfiguration(); - - try { - final Display display = PlatformUI.getWorkbench().getDisplay(); - - WMSConfigurationWizard wizard = new WMSConfigurationWizard( - configuration, true, false); - WizardDialog dialog = new WizardDialog(display.getActiveShell(), wizard); - if (dialog.open() == WizardDialog.OK) { - configuration.save(overwrite); - return true; - } - else { - return false; - } - } catch (Exception e) { - log.error("Error creating WMS overlay", e); //$NON-NLS-1$ - } - - return false; - } - - /** - * @see ExtensionObjectFactoryCollection#allowAddNew() - */ - @Override - public boolean allowAddNew() { - return true; - } - - /** - * @see ExtensionObjectFactoryCollection#allowRemove() - */ - @Override - public boolean allowRemove() { - return true; - } - - /** - * @see ExtensionObjectFactoryCollection#getFactories() - */ - @Override - public List getFactories() { - List results = new LinkedList(); - - for (String name : WMSTileOverlay.getConfigurationNames()) { - results.add(new OverlayFactory(name)); - } - - return results; - } - - /** - * @see ExtensionObjectFactoryCollection#getName() - */ - @Override - public String getName() { - return Messages.WMSTileOverlayCollection_1; - } - - /** - * @see ExtensionObjectFactoryCollection#remove(ExtensionObjectFactory) - */ - @Override - public boolean remove(TileOverlayFactory factory) { - return WMSTileOverlay.removeConfiguration(factory.getDisplayName()); - } - - /** - * @see TileOverlayFactoryCollection#setPriority(int) - */ - @Override - public void setPriority(int priority) { - this.priority = priority; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/AddTextureImageFromWMSWizard.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/AddTextureImageFromWMSWizard.java deleted file mode 100644 index 5774b4fbb2..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/AddTextureImageFromWMSWizard.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.server.wms.wizard; - -import de.fhg.igd.mapviewer.server.wms.WMSResolutionConfiguration; -import de.fhg.igd.mapviewer.server.wms.wizard.pages.BasicConfigurationWithWMSListPage; -import de.fhg.igd.mapviewer.server.wms.wizard.pages.LayerConfigurationPage; -import de.fhg.igd.mapviewer.server.wms.wizard.pages.ResolutionConfigurationPage; -import de.fhg.igd.mapviewer.server.wms.wizard.pages.SRSConfigurationPage; - -/** - * Derived wizard for the Add Teture Image From WMS feature, described here - * de.cs3d.ui.views.appearanceAddTextureImageFromWMSAction.run() Extends the - * basic configuration page by an list showing all stored WMS. - * - * @author Benedikt Hiemenz - * @param the WMS client configuration type - */ -public class AddTextureImageFromWMSWizard - extends WMSConfigurationWizard { - - /** - * Constructor - * - * @param configuration the WMS client configuration - * @param allowBasicEdit if changing basic settings shall be allowed - * @param allowSrsEdit if changing the preferred SRS is allowed - */ - public AddTextureImageFromWMSWizard(T configuration, boolean allowBasicEdit, - boolean allowSrsEdit) { - super(configuration, allowBasicEdit, allowSrsEdit); - } - - @Override - public void addPages() { - BasicConfigurationWithWMSListPage conf = new BasicConfigurationWithWMSListPage( - configuration); - - if (allowBasicEdit) { - addPage(conf); - } - if (allowSrsEdit) { - addPage(new SRSConfigurationPage(conf, configuration)); - } - addPage(new LayerConfigurationPage(conf, configuration)); - addPage(new ResolutionConfigurationPage(configuration)); - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/WMSConfigurationWizard.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/WMSConfigurationWizard.java deleted file mode 100644 index 913a16d27f..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/WMSConfigurationWizard.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard; - -import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jface.wizard.Wizard; - -import de.fhg.igd.mapviewer.server.wms.WMSConfiguration; -import de.fhg.igd.mapviewer.server.wms.wizard.pages.BasicConfigurationPage; -import de.fhg.igd.mapviewer.server.wms.wizard.pages.LayerConfigurationPage; -import de.fhg.igd.mapviewer.server.wms.wizard.pages.SRSConfigurationPage; - -/** - * Wizard for configuring a {@link WMSConfiguration} - * - * @param the WMS client configuration type - * @author Simon Templer - */ -public class WMSConfigurationWizard extends Wizard { - - /** - * The WMS configuration - */ - protected final T configuration; - - /** - * Allow user to edit basic configurations - */ - protected final boolean allowBasicEdit; - - /** - * Allow user to edit the SRS - */ - protected final boolean allowSrsEdit; - - /** - * Constructor - * - * @param configuration the WMS client configuration - * @param allowBasicEdit if changing basic settings shall be allowed - * @param allowSrsEdit if changing the preferred SRS is allowed - */ - public WMSConfigurationWizard(T configuration, boolean allowBasicEdit, boolean allowSrsEdit) { - this.configuration = configuration; - this.allowBasicEdit = allowBasicEdit; - this.allowSrsEdit = allowSrsEdit; - setWindowTitle("Web Map Service Configuration"); - } - - /** - * @see Wizard#addPages() - */ - @Override - public void addPages() { - - BasicConfigurationPage conf = new BasicConfigurationPage(configuration); - - if (allowBasicEdit) { - addPage(conf); - } - if (allowSrsEdit) { - addPage(new SRSConfigurationPage(conf, configuration)); - } - addPage(new LayerConfigurationPage(conf, configuration)); - } - - /** - * @see Wizard#performFinish() - */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public boolean performFinish() { - for (IWizardPage page : getPages()) { - boolean valid = ((WMSWizardPage) page).updateConfiguration(configuration); - if (!valid) { - return false; - } - } - - return configuration.validateSettings(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/WMSResolutionConfigurationWizard.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/WMSResolutionConfigurationWizard.java deleted file mode 100644 index 4249946f98..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/WMSResolutionConfigurationWizard.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.server.wms.wizard; - -import de.fhg.igd.mapviewer.server.wms.WMSResolutionConfiguration; -import de.fhg.igd.mapviewer.server.wms.wizard.pages.ResolutionConfigurationPage; - -/** - * Extends WMSConfigurationWizard to show additional resolution configuration - * page - * - * @author Benedikt Hiemenz - * @param the WMS client configuration type - */ -public class WMSResolutionConfigurationWizard - extends WMSConfigurationWizard { - - /** - * Constructor - * - * @param configuration the WMS client configuration - * @param allowBasicEdit if changing basic settings shall be allowed - * @param allowSrsEdit if changing the preferred SRS is allowed - */ - public WMSResolutionConfigurationWizard(T configuration, boolean allowBasicEdit, - boolean allowSrsEdit) { - super(configuration, allowBasicEdit, allowSrsEdit); - } - - @Override - public void addPages() { - super.addPages(); - addPage(new ResolutionConfigurationPage(configuration)); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/WMSTileConfigurationWizard.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/WMSTileConfigurationWizard.java deleted file mode 100644 index 00c0bcb238..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/WMSTileConfigurationWizard.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard; - -import de.fhg.igd.mapviewer.server.wms.WMSTileConfiguration; -import de.fhg.igd.mapviewer.server.wms.wizard.pages.TileConfigurationPage; - -/** - * Wizard for configuring a {@link WMSTileConfiguration} - * - * @author Simon Templer - */ -public class WMSTileConfigurationWizard extends WMSConfigurationWizard { - - /** - * Constructor - * - * @param configuration the WMS tile configuration - * @param allowBasicEdit if editing of the service URL shall be allowed - */ - public WMSTileConfigurationWizard(WMSTileConfiguration configuration, boolean allowBasicEdit) { - super(configuration, allowBasicEdit, true); - } - - /** - * @see WMSConfigurationWizard#addPages() - */ - @Override - public void addPages() { - super.addPages(); - - addPage(new TileConfigurationPage(configuration)); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/WMSWizardPage.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/WMSWizardPage.java deleted file mode 100644 index 996775ead4..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/WMSWizardPage.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard; - -import org.eclipse.jface.dialogs.IDialogPage; -import org.eclipse.jface.dialogs.IPageChangeProvider; -import org.eclipse.jface.dialogs.IPageChangedListener; -import org.eclipse.jface.dialogs.PageChangedEvent; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.wizard.IWizardContainer; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.widgets.Composite; - -import de.fhg.igd.mapviewer.server.wms.WMSConfiguration; - -/** - * Basic wizard page for WMS configuration - * - * @param the WMS client configuration type - * @author Simon Templer - */ -public abstract class WMSWizardPage extends WizardPage { - - private final T configuration; - - /** - * Constructor - * - * @param configuration the WMS configuration - * @param pageName the page name - * @param title the title - * @param titleImage the title image - */ - public WMSWizardPage(T configuration, String pageName, String title, - ImageDescriptor titleImage) { - super(pageName, title, titleImage); - - this.configuration = configuration; - } - - /** - * Constructor - * - * @param configuration the configuration server - * @param pageName the page name - */ - public WMSWizardPage(T configuration, String pageName) { - super(pageName); - - this.configuration = configuration; - } - - /** - * Get the WMS configuration - * - * @return the WMS configuration - */ - public T getConfiguration() { - return configuration; - } - - /** - * Update the WMS configuration - * - * @param configuration the WMS configuration - * @return if the page is valid - */ - public abstract boolean updateConfiguration(T configuration); - - /** - * @see IDialogPage#createControl(Composite) - */ - @Override - public void createControl(Composite parent) { - IWizardContainer container = getContainer(); - - if (container instanceof IPageChangeProvider) { - ((IPageChangeProvider) container).addPageChangedListener(new IPageChangedListener() { - - @Override - public void pageChanged(PageChangedEvent event) { - if (event.getSelectedPage() == WMSWizardPage.this) { - onShowPage(); - } - } - }); - } - - createContent(parent); - } - - /** - * Called when this page is shown - */ - protected void onShowPage() { - // do nothing - } - - /** - * Create the page content - * - * @param parent the parent composite - */ - protected abstract void createContent(Composite parent); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/BasicConfigurationPage.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/BasicConfigurationPage.java deleted file mode 100644 index 017e738697..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/BasicConfigurationPage.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard.pages; - -import org.eclipse.jface.preference.FieldEditor; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; - -import de.fhg.igd.mapviewer.server.wms.WMSConfiguration; -import de.fhg.igd.mapviewer.server.wms.wizard.WMSWizardPage; - -/** - * Basic configuration page. - * - * @author Simon Templer - */ -public class BasicConfigurationPage extends WMSWizardPage { - - /** - * Field for WMS location. - */ - protected WMSLocationFieldEditor location; - - /** - * Field for WMS name. - */ - protected ConfigurationNameFieldEditor name = null; - - private Composite page; - - private boolean checkName = true; - - /** - * Default constructor - * - * @param configuration the WMS configuration - */ - public BasicConfigurationPage(WMSConfiguration configuration) { - super(configuration, Messages.BasicConfigurationPage_0); - - setTitle(Messages.BasicConfigurationPage_1); - setMessage(Messages.BasicConfigurationPage_2); - } - - /** - * @see WMSWizardPage#updateConfiguration(WMSConfiguration) - */ - @Override - public boolean updateConfiguration(WMSConfiguration configuration) { - if (location.isValid() && (!checkName || name.isValid())) { - configuration.setBaseUrl(location.getStringValue()); - configuration.setName(name.getStringValue()); - return true; - } - - return false; - } - - /** - * @see WMSWizardPage#createContent(Composite) - */ - @Override - public void createContent(Composite parent) { - page = new Composite(parent, SWT.NONE); - page.setLayout(new GridLayout(3, false)); - - createComponent(); - - setControl(page); - update(); - } - - /** - * Create components for basic options, the service name and location. - */ - protected void createComponent() { - // name - String serverName = getConfiguration().getName(); - boolean enterName = serverName == null || serverName.isEmpty(); - - name = new ConfigurationNameFieldEditor(getConfiguration()); - name.fillIntoGrid(page, 3); - name.setStringValue(serverName); - if (!enterName) { - checkName = false; - name.setEnabled(false, page); - } - name.setLabelText(Messages.BasicConfigurationPage_3); - name.setPage(this); - name.setPropertyChangeListener(new IPropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(FieldEditor.IS_VALID)) { - update(); - } - } - }); - - // location - location = new WMSLocationFieldEditor(page.getDisplay()); - location.fillIntoGrid(page, 3); - location.setEmptyStringAllowed(false); - location.setStringValue(getConfiguration().getBaseUrl()); - location.setLabelText(Messages.BasicConfigurationPage_4); - location.setPage(this); - location.setPropertyChangeListener(new IPropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(FieldEditor.IS_VALID)) { - update(); - } - } - }); - } - - private void update() { - setPageComplete(location.isValid() && (!checkName || name.isValid())); - } - - /** - * Get the service URL - * - * @return the service URL - */ - public String getServiceURL() { - return location.getStringValue(); - } - - /** - * Get the service name - * - * @return the service name - */ - public String getServiceName() { - return name.getStringValue(); - } - - /** - * @return basic configuration page - */ - public Composite getComposite() { - return page; - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/BasicConfigurationWithWMSListPage.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/BasicConfigurationWithWMSListPage.java deleted file mode 100644 index 9263a5d673..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/BasicConfigurationWithWMSListPage.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.server.wms.wizard.pages; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import java.util.prefs.BackingStoreException; -import java.util.prefs.Preferences; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.viewers.ArrayContentProvider; -import org.eclipse.jface.viewers.ComboViewer; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Text; - -import de.fhg.igd.mapviewer.server.wms.WMSConfiguration; -import de.fhg.igd.mapviewer.server.wms.WMSMapServer; - -/** - * Extend the BasicConfigurationPage by a list holding all WMS already exist, so - * the user can select a stored WMS for his orthophoto. Also a button is shown - * to add new WMS to the list. - * - * @author Benedikt Hiemenz - */ -public class BasicConfigurationWithWMSListPage extends BasicConfigurationPage { - - private static final Log log = LogFactory.getLog(BasicConfigurationWithWMSListPage.class); - - // map holding all stored WMS - private HashMap map; - private ArrayList listUI; - - // list viewing stored WMS - private ComboViewer comboViewer; - - /** - * Default constructor - * - * @param configuration the WMS configuration - */ - public BasicConfigurationWithWMSListPage(WMSConfiguration configuration) { - super(configuration); - - this.map = new HashMap(); - this.listUI = new ArrayList(); - } - - @Override - public void createComponent() { - super.createComponent(); - - Button storeWMS = new Button(getComposite(), SWT.PUSH); - storeWMS.setText(Messages.WMSListConfigurationPage_2); - - // add new WMS to list and refresh - storeWMS.addSelectionListener(new SelectionAdapter() { - - @Override - public void widgetSelected(SelectionEvent e) { - // store WMS i UI list - map.put(getServiceName(), getServiceURL()); - getListForUI(listUI); - comboViewer.refresh(); - } - }); - - // free line - new Text(getComposite(), SWT.NONE).setEditable(false); - new Text(getComposite(), SWT.NONE).setEditable(false); - new Text(getComposite(), SWT.NONE).setEditable(false); - new Text(getComposite(), SWT.NONE).setEditable(false); - new Text(getComposite(), SWT.NONE).setEditable(false); - - // add text and combo viewer - Text text = new Text(getComposite(), SWT.NONE); - text.setEditable(false); - text.setText(Messages.WMSListConfigurationPage_0); - - // get a list of all WMS - - // get all WMS, storing as WMS Map Server - Preferences PREF_SERVERS = new WMSMapServer().getPreferences(); - - String[] prefs = null; - try { - prefs = PREF_SERVERS.childrenNames(); - - // put all in map - for (String current : prefs) { - - Preferences child = PREF_SERVERS.node(current); - map.put(current, child.get("baseUrl", "baseUrl")); - } - - } catch (BackingStoreException e) { - log.warn(Messages.WMSListConfigurationPage_1, e); // $NON-NLS-1$ - } - - // get all WMS, storing as extension points - IConfigurationElement[] allER = Platform.getExtensionRegistry() - .getConfigurationElementsFor("de.fhg.igd.mapviewer.server.MapServer"); - - for (IConfigurationElement current : allER) { - String name = ""; - String url = ""; - - // name is stored directly as attribute - name = current.getAttribute("name"); - - // url is stored as child - for (IConfigurationElement child : current.getChildren()) { - if (child.getAttribute("name").equals("baseUrl")) { - url = child.getAttribute("value"); - } - } - // store everything into map - if (name != null && !name.isEmpty() && url != null && !url.isEmpty()) { - map.put(name, url); - } - } - - // show stored WMS as DropDown - comboViewer = new ComboViewer(getComposite(), SWT.DROP_DOWN | SWT.BORDER | SWT.READ_ONLY); - comboViewer.setContentProvider(new ArrayContentProvider()); - getListForUI(listUI); - comboViewer.setInput(listUI); - comboViewer.addSelectionChangedListener(new ISelectionChangedListener() { - - @Override - public void selectionChanged(SelectionChangedEvent event) { - IStructuredSelection selection = (IStructuredSelection) event.getSelection(); - if (selection.size() > 0) { - String currentSelection = (String) selection.getFirstElement(); - name.setStringValue(currentSelection); - location.setStringValue(map.get(currentSelection)); - } - } - }); - } - - @Override - public boolean updateConfiguration(WMSConfiguration configuration) { - - // only location need to be valid - if (location.isValid()) { - configuration.setBaseUrl(location.getStringValue()); - configuration.setName(getServiceName()); - return true; - } - return false; - } - - /** - * Put all map entries into a given list - * - * @param list list to fill - */ - private void getListForUI(ArrayList list) { - - list.clear(); - for (Map.Entry entry : map.entrySet()) { - list.add(entry.getKey()); - } - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/ConcurrentValidator.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/ConcurrentValidator.java deleted file mode 100644 index 97f0e8d52f..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/ConcurrentValidator.java +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard.pages; - -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import de.fhg.igd.mapviewer.concurrency.Callback; -import de.fhg.igd.mapviewer.concurrency.Concurrency; -import de.fhg.igd.mapviewer.concurrency.IJob; -import de.fhg.igd.mapviewer.concurrency.Job; -import de.fhg.igd.mapviewer.concurrency.Progress; - -/** - * Concurrent validator - * - * @author Simon Templer - */ -public class ConcurrentValidator { - - /** - * Validation call-back wrapper - */ - private class CallbackWrapper implements Callback { - - private final Callback callback; - - /** - * Constructor - * - * @param callback the wrapped call-back - */ - public CallbackWrapper(Callback callback) { - this.callback = callback; - } - - /** - * @see Callback#done(Object) - */ - @Override - public void done(Boolean result) { - if (result != null) { - stateLock.lock(); - valid = result; // set validity value - stateLock.unlock(); - callback.done(result); - } - } - - /** - * @see Callback#failed(Throwable) - */ - @Override - public void failed(Throwable e) { - stateLock.lock(); - valid = false; // set validity value - stateLock.unlock(); - callback.failed(e); - } - - } - - /** - * Validation interface - */ - public interface Validation { - - /** - * Validate something - * - * @return if the validation result is valid - * @throws Exception if an error occurs - */ - public boolean validate() throws Exception; - } - - private boolean valid; - - private final Lock stateLock = new ReentrantLock(); - - private Validation lastValidation = null; - - private final Lock validationLock = new ReentrantLock(); - - private final Callback callback; - - /** - * Constructor - * - * @param callback the call-back for validation updates - * @param valid the initial valid state - */ - public ConcurrentValidator(final Callback callback, boolean valid) { - this.valid = valid; - this.callback = callback; - } - - /** - * Determine the valid state - * - * @return the valid state - */ - public boolean isValid() { - stateLock.lock(); - try { - return valid; - } finally { - stateLock.unlock(); - } - } - - /** - * Run a validation - * - * @param validation the validation to run - */ - public void runValidation(final Validation validation) { - validationLock.lock(); - try { - lastValidation = validation; - } finally { - validationLock.unlock(); - } - - IJob job = new Job(Messages.ConcurrentValidator_0, - new CallbackWrapper(callback)) { - - @Override - public Boolean work(Progress progress) throws Exception { - try { - Boolean result = validation.validate(); - validationLock.lock(); - if (lastValidation != validation) { - // ignore this validation result - result = null; - } - validationLock.unlock(); - return result; - } catch (Exception e) { - if (lastValidation == validation) { - throw e; // only throw errors that result in state - // changes - } - else - return null; - } - } - }; - - Concurrency.startJob(job); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/ConfigurationNameFieldEditor.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/ConfigurationNameFieldEditor.java deleted file mode 100644 index fa995a9f2a..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/ConfigurationNameFieldEditor.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard.pages; - -import org.eclipse.jface.preference.StringFieldEditor; - -import de.fhg.igd.mapviewer.server.wms.WMSConfiguration; - -/** - * Field editor for a WMS configuration name - * - * @author Simon Templer - */ -public class ConfigurationNameFieldEditor extends StringFieldEditor { - - private final WMSConfiguration configuration; - - /** - * Default constructor - * - * @param configuration the WMS configuration - */ - public ConfigurationNameFieldEditor(WMSConfiguration configuration) { - super(); - - setEmptyStringAllowed(false); - - this.configuration = configuration; - } - - /** - * @see StringFieldEditor#doCheckState() - */ - @Override - protected boolean doCheckState() { - String text = getStringValue(); - - if (text.indexOf('/') >= 0) { // invalid characters TODO refine - setErrorMessage(Messages.ServerNameFieldEditor_0); - return false; - } - - try { - // don't allow already existing names - boolean exists = configuration.nameExists(text); - if (exists) { - setErrorMessage(Messages.ServerNameFieldEditor_1); - } - return !exists; - } catch (Exception e) { - setErrorMessage(e.getLocalizedMessage()); - return false; - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/LayerConfigurationPage.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/LayerConfigurationPage.java deleted file mode 100644 index fcd0589c65..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/LayerConfigurationPage.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard.pages; - -import org.eclipse.jface.preference.FieldEditor; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; - -import de.fhg.igd.mapviewer.server.wms.WMSConfiguration; -import de.fhg.igd.mapviewer.server.wms.wizard.WMSWizardPage; - -/** - * Layer configuration page. - * - * @author Simon Templer - */ -public class LayerConfigurationPage extends WMSWizardPage - implements IPropertyChangeListener { - - private LayersFieldEditor layers; - - private final BasicConfigurationPage conf; - - /** - * Constructor - * - * @param conf the basic WMS configuration page - * @param configuration the WMS configuration - */ - public LayerConfigurationPage(final BasicConfigurationPage conf, - WMSConfiguration configuration) { - super(configuration, Messages.LayerConfigurationPage_0); - - setTitle(Messages.LayerConfigurationPage_1); - setMessage(Messages.LayerConfigurationPage_2); - - this.conf = conf; - } - - /** - * @see WMSWizardPage#updateConfiguration(WMSConfiguration) - */ - @Override - public boolean updateConfiguration(WMSConfiguration configuration) { - if (layers.isValid()) { - configuration.setLayers(layers.getStringValue()); - return true; - } - - return false; - } - - /** - * @see WMSWizardPage#createContent(Composite) - */ - @Override - public void createContent(Composite parent) { - Composite page = new Composite(parent, SWT.NONE); - - page.setLayout(new GridLayout(3, false)); - - // layers - layers = new LayersFieldEditor(conf); - layers.fillIntoGrid(page, 3); - layers.setLabelText(Messages.LayerConfigurationPage_3); - layers.setEmptyStringAllowed(true); - layers.setStringValue(getConfiguration().getLayers()); - layers.setPage(this); - layers.setPropertyChangeListener(this); - - setControl(page); - - update(); - } - - private void update() { - setPageComplete(layers.isValid()); - } - - /** - * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent) - */ - @Override - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(FieldEditor.IS_VALID)) { - update(); - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/LayersDialog.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/LayersDialog.java deleted file mode 100644 index 48b141998c..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/LayersDialog.java +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard.pages; - -import java.util.List; - -import org.eclipse.jface.dialogs.TitleAreaDialog; -import org.eclipse.jface.viewers.BaseLabelProvider; -import org.eclipse.jface.viewers.CheckStateChangedEvent; -import org.eclipse.jface.viewers.CheckboxTableViewer; -import org.eclipse.jface.viewers.ICheckStateListener; -import org.eclipse.jface.viewers.ICheckStateProvider; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.TableColumn; - -import de.fhg.igd.mapviewer.server.wms.capabilities.Layer; - -/** - * Dialog for selecting and ordering {@link Layer}s - * - * @author Simon Templer - */ -public class LayersDialog extends TitleAreaDialog { - - /** - * Check state provider for {@link Layer}s - */ - private static class LayerCheckStateProvider implements ICheckStateProvider { - - /** - * @see ICheckStateProvider#isChecked(java.lang.Object) - */ - @Override - public boolean isChecked(Object element) { - if (element instanceof Layer) { - return ((Layer) element).isSelected(); - } - else { - return false; - } - } - - /** - * @see ICheckStateProvider#isGrayed(java.lang.Object) - */ - @Override - public boolean isGrayed(Object element) { - return false; - } - - } - - /** - * Label provider for {@link Layer}s - */ - private static class LayerLabelProvider extends BaseLabelProvider - implements ITableLabelProvider { - - /** - * @see ITableLabelProvider#getColumnImage(java.lang.Object, int) - */ - @Override - public Image getColumnImage(Object element, int columnIndex) { - return null; - } - - /** - * @see ITableLabelProvider#getColumnText(java.lang.Object, int) - */ - @Override - public String getColumnText(Object element, int columnIndex) { - if (element instanceof Layer) { - Layer layer = (Layer) element; - switch (columnIndex) { - case 0: - return layer.getDisplayName(); - case 1: - return layer.getDescription(); - default: - return null; - } - } - else { - return element.toString(); - } - } - - } - - private final List layers; - - /** - * Constructor - * - * @param parentShell the shell - * @param layers the layer list - */ - public LayersDialog(Shell parentShell, final List layers) { - super(parentShell); - - this.layers = layers; - } - - /** - * @see TitleAreaDialog#createContents(Composite) - */ - @Override - protected Control createContents(Composite parent) { - Control control = super.createContents(parent); - - setMessage(Messages.LayersDialog_0); - setTitle(Messages.LayersDialog_1); - - return control; - } - - /** - * @see TitleAreaDialog#createDialogArea(Composite) - */ - @Override - protected Control createDialogArea(Composite parent) { - Composite page = new Composite(parent, SWT.NONE); - GridData data = new GridData(SWT.FILL, SWT.FILL, true, true); - page.setLayoutData(data); - page.setLayout(new FillLayout()); - - CheckboxTableViewer table = CheckboxTableViewer.newCheckList(page, - SWT.V_SCROLL | SWT.BORDER); - - TableColumn names = new TableColumn(table.getTable(), SWT.NONE); - names.setWidth(200); - names.setText(Messages.LayersDialog_2); - TableColumn descs = new TableColumn(table.getTable(), SWT.NONE); - descs.setWidth(200); - descs.setText(Messages.LayersDialog_3); - - // labels - table.setLabelProvider(new LayerLabelProvider()); - table.setCheckStateProvider(new LayerCheckStateProvider()); - table.addCheckStateListener(new ICheckStateListener() { - - @Override - public void checkStateChanged(CheckStateChangedEvent event) { - ((Layer) event.getElement()).setSelected(event.getChecked()); - } - - }); - - // content - table.setContentProvider(new IStructuredContentProvider() { - - @Override - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - // ignore - } - - @Override - public void dispose() { - // ignore - } - - @Override - @SuppressWarnings("unchecked") - public Object[] getElements(Object inputElement) { - return ((List) inputElement).toArray(); - } - }); - - table.setInput(layers); - table.getTable().setLinesVisible(true); - table.getTable().setHeaderVisible(true); - - // pack columns - names.pack(); - descs.pack(); - - return page; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/LayersFieldEditor.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/LayersFieldEditor.java deleted file mode 100644 index fa6c6d17b7..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/LayersFieldEditor.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard.pages; - -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.jface.preference.StringButtonFieldEditor; -import org.eclipse.jface.preference.StringFieldEditor; - -import de.fhg.igd.mapviewer.server.wms.capabilities.Layer; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSCapabilities; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSUtil; - -/** - * Layers field editor. - * - * @author Simon Templer - */ -public class LayersFieldEditor extends StringButtonFieldEditor { - - private static final Log log = LogFactory.getLog(LayersFieldEditor.class); - - private final BasicConfigurationPage conf; - - /** - * Constructor - * - * @param conf the WMS configuration - */ - public LayersFieldEditor(BasicConfigurationPage conf) { - this.conf = conf; - } - - /** - * @see StringButtonFieldEditor#changePressed() - */ - @Override - protected String changePressed() { - String layerString = getStringValue(); - try { - WMSCapabilities capabilities = WMSUtil.getCapabilities(conf.getServiceURL()); - List layers = WMSUtil.getLayers(layerString, capabilities); - - LayersDialog dialog = new LayersDialog(getShell(), layers); - if (dialog.open() == LayersDialog.OK) { - return WMSUtil.getLayerString(layers, false); - } - else { - return null; - } - } catch (Exception e) { - log.error("Error getting WMS capabilities", e); //$NON-NLS-1$ - return null; - } - } - - /** - * @see StringFieldEditor#setStringValue(java.lang.String) - */ - @Override - public void setStringValue(String value) { - super.setStringValue(value); - - refreshValidState(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/Messages.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/Messages.java deleted file mode 100644 index 9919bc43b8..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/Messages.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard.pages; - -import org.eclipse.osgi.util.NLS; - -/** - * WMS message bundle - * - * @author Simon Templer - */ -@SuppressWarnings("all") -public class Messages extends NLS { - - private static final String BUNDLE_NAME = "de.fhg.igd.mapviewer.server.wms.wizard.pages.messages"; //$NON-NLS-1$ - public static String BasicConfigurationPage_0; - public static String BasicConfigurationPage_1; - public static String BasicConfigurationPage_2; - public static String BasicConfigurationPage_3; - public static String BasicConfigurationPage_4; - public static String WMSListConfigurationPage_0; - public static String WMSListConfigurationPage_1; - public static String WMSListConfigurationPage_2; - public static String ConcurrentValidator_0; - public static String LayerConfigurationPage_0; - public static String LayerConfigurationPage_1; - public static String LayerConfigurationPage_2; - public static String LayerConfigurationPage_3; - public static String LayersDialog_0; - public static String LayersDialog_1; - public static String LayersDialog_2; - public static String LayersDialog_3; - public static String ServerNameFieldEditor_0; - public static String ServerNameFieldEditor_1; - public static String ResolutionConfigurationPage_0; - public static String ResolutionConfigurationPage_1; - public static String ResolutionConfigurationPage_2; - public static String ResolutionConfigurationPage_3; - public static String ResolutionConfigurationPage_4; - public static String ResolutionConfigurationPage_5; - - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/ResolutionConfigurationPage.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/ResolutionConfigurationPage.java deleted file mode 100644 index ef02184ec8..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/ResolutionConfigurationPage.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.server.wms.wizard.pages; - -import org.eclipse.jface.preference.FieldEditor; -import org.eclipse.jface.preference.IntegerFieldEditor; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.FocusEvent; -import org.eclipse.swt.events.FocusListener; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; - -import de.fhg.igd.mapviewer.server.wms.WMSResolutionConfiguration; -import de.fhg.igd.mapviewer.server.wms.wizard.WMSWizardPage; - -/** - * Wizard page for configuring the resolution for orthophotos. - * - * @author Benedikt Hiemenz - */ -public class ResolutionConfigurationPage extends WMSWizardPage - implements IPropertyChangeListener { - - private IntegerFieldEditor xTileSize; - private IntegerFieldEditor yTileSize; - - /** - * Constructor - * - * @param configuration the WMS client configuration - */ - public ResolutionConfigurationPage(WMSResolutionConfiguration configuration) { - super(configuration, Messages.ResolutionConfigurationPage_0); // $NON-NLS-1$ - - setTitle(Messages.ResolutionConfigurationPage_0); - setMessage(Messages.ResolutionConfigurationPage_1); - } - - @Override - public boolean updateConfiguration(WMSResolutionConfiguration configuration) { - - if (isPageComplete()) { - configuration.setxTileSize(xTileSize.getIntValue()); - configuration.setyTileSize(yTileSize.getIntValue()); - return true; - } - - return false; - } - - @Override - public void createContent(Composite parent) { - Composite page = new Composite(parent, SWT.NONE); - - page.setLayout(new GridLayout(3, false)); - - // x size - xTileSize = new IntegerFieldEditor("xSize", Messages.ResolutionConfigurationPage_2, page); //$NON-NLS-1$ - xTileSize.setValidRange(64, 32768); - xTileSize.setStringValue(String.valueOf(getConfiguration().getxTileSize())); - xTileSize.setPage(this); - xTileSize.setPropertyChangeListener(this); - final String xTileTip = Messages.ResolutionConfigurationPage_3; - xTileSize.getLabelControl(page).setToolTipText(xTileTip); - xTileSize.getTextControl(page).setToolTipText(xTileTip); - xTileSize.getTextControl(page).addFocusListener(new FocusListener() { - - @Override - public void focusLost(FocusEvent e) { - setMessage(null); - } - - @Override - public void focusGained(FocusEvent e) { - setMessage(xTileTip, INFORMATION); - } - }); - - // y size - yTileSize = new IntegerFieldEditor("ySize", Messages.ResolutionConfigurationPage_4, page); //$NON-NLS-1$ - yTileSize.setValidRange(64, 32768); - yTileSize.setStringValue(String.valueOf(getConfiguration().getyTileSize())); - yTileSize.setPage(this); - yTileSize.setPropertyChangeListener(this); - final String yTileTip = Messages.ResolutionConfigurationPage_5; - yTileSize.getLabelControl(page).setToolTipText(yTileTip); - yTileSize.getTextControl(page).setToolTipText(yTileTip); - yTileSize.getTextControl(page).addFocusListener(new FocusListener() { - - @Override - public void focusLost(FocusEvent e) { - setMessage(null); - } - - @Override - public void focusGained(FocusEvent e) { - setMessage(yTileTip, INFORMATION); - } - }); - - setControl(page); - - update(); - } - - private void update() { - setPageComplete(xTileSize.isValid() && yTileSize.isValid()); - } - - @Override - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(FieldEditor.IS_VALID)) { - update(); - } - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/SRSConfigurationPage.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/SRSConfigurationPage.java deleted file mode 100644 index 29ae331691..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/SRSConfigurationPage.java +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard.pages; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.jface.viewers.ArrayContentProvider; -import org.eclipse.jface.viewers.ComboViewer; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.geotools.referencing.CRS; -import org.opengis.referencing.crs.CoordinateReferenceSystem; - -import de.fhg.igd.mapviewer.server.wms.Messages; -import de.fhg.igd.mapviewer.server.wms.WMSConfiguration; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSCapabilities; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSCapabilitiesException; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSUtil; -import de.fhg.igd.mapviewer.server.wms.wizard.WMSWizardPage; - -/** - * Wizard page for configuring the spatial reference system to use. - * - * @author Simon Templer - */ -public class SRSConfigurationPage extends WMSWizardPage { - - private static class SRSLabelProvider extends LabelProvider { - - @Override - public String getText(Object element) { - String text = element.toString(); - - if (text.equals(SRS_ANY)) { - return text; - } - else { - try { - CoordinateReferenceSystem crs = CRS.decode(text); - return crs.getName().toString() + " (" + text + ")"; - } catch (Throwable e) { - return text; - } - } - } - - } - - private static final Log log = LogFactory.getLog(SRSConfigurationPage.class); - - private static final String SRS_ANY = Messages.SRSConfigurationPage_0; - - private final BasicConfigurationPage conf; - - private ComboViewer viewer; - - private WMSCapabilities capabilities = null; - - /** - * Constructor - * - * @param conf the basic WMS configuration - * @param configuration the WMS client configuration - */ - public SRSConfigurationPage(final BasicConfigurationPage conf, WMSConfiguration configuration) { - super(configuration, "SRS"); //$NON-NLS-1$ - - this.conf = conf; - - setTitle(Messages.SRSConfigurationPage_2); - setMessage(Messages.SRSConfigurationPage_3); - } - - /** - * @see WMSWizardPage#createContent(Composite) - */ - @Override - public void createContent(Composite parent) { - Composite page = new Composite(parent, SWT.NONE); - - page.setLayout(new GridLayout(1, false)); - - // SRS - Combo combo = new Combo(page, SWT.DROP_DOWN | SWT.READ_ONLY); - combo.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false)); - viewer = new ComboViewer(combo); - viewer.setContentProvider(new ArrayContentProvider()); - viewer.setLabelProvider(new SRSLabelProvider()); - viewer.addPostSelectionChangedListener(new ISelectionChangedListener() { - - @Override - public void selectionChanged(SelectionChangedEvent event) { - update(); - } - - }); - - setControl(page); - - update(); - } - - private void update() { - setPageComplete(!viewer.getSelection().isEmpty()); - } - - /** - * @see WMSWizardPage#updateConfiguration(WMSConfiguration) - */ - @Override - public boolean updateConfiguration(WMSConfiguration configuration) { - ISelection selection = viewer.getSelection(); - - if (selection != null && selection instanceof IStructuredSelection) { - try { - String srs = (String) ((IStructuredSelection) selection).getFirstElement(); - if (srs.equals(SRS_ANY)) { - configuration.setPreferredEpsg(0); - } - else { - configuration.setPreferredEpsg(Integer.parseInt(srs.substring(5))); - } - return true; - } catch (Exception e) { - log.warn("Error setting SRS", e); //$NON-NLS-1$ - } - } - - return false; - } - - /** - * @see WMSWizardPage#onShowPage() - */ - @Override - protected void onShowPage() { - // get last selection - ISelection selection = viewer.getSelection(); - String lastSelection = null; - if (selection != null && selection instanceof IStructuredSelection) { - lastSelection = (String) ((IStructuredSelection) selection).getFirstElement(); - } - - // update input - String url = conf.getServiceURL(); - - List input = new ArrayList(); - input.add(SRS_ANY); - try { - capabilities = WMSUtil.getCapabilities(url); - -// for (String srs : capabilities.getBoundingBoxes().keySet()) { -// input.add(srs); -// } - for (String srs : capabilities.getSupportedSRS()) { - try { - CRS.decode(srs); // test if known - input.add(srs); - } catch (Exception e) { - // ignore - unknown - } - } - - } catch (WMSCapabilitiesException e) { - // ignore - } - - viewer.setInput(input); - - // update selection - if (lastSelection == null) { - String def = "EPSG:" + getConfiguration().getPreferredEpsg(); //$NON-NLS-1$ - if (input.contains(def)) { - lastSelection = def; - } - else { - lastSelection = SRS_ANY; - } - } - - viewer.setSelection(new StructuredSelection(lastSelection)); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/TileConfigurationPage.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/TileConfigurationPage.java deleted file mode 100644 index cb46095010..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/TileConfigurationPage.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard.pages; - -import org.eclipse.jface.preference.FieldEditor; -import org.eclipse.jface.preference.IntegerFieldEditor; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.FocusEvent; -import org.eclipse.swt.events.FocusListener; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; - -import de.fhg.igd.mapviewer.server.wms.Messages; -import de.fhg.igd.mapviewer.server.wms.WMSConfiguration; -import de.fhg.igd.mapviewer.server.wms.WMSTileConfiguration; -import de.fhg.igd.mapviewer.server.wms.wizard.WMSWizardPage; - -/** - * Tile configuration page. - * - * @author Simon Templer - */ -public class TileConfigurationPage extends WMSWizardPage - implements IPropertyChangeListener { - - private IntegerFieldEditor zoomLevels; - - private IntegerFieldEditor minTileSize; - - private IntegerFieldEditor minMapSize; - - /** - * Constructor - * - * @param configuration the WMS configuration - */ - public TileConfigurationPage(WMSTileConfiguration configuration) { - super(configuration, Messages.TileConfigurationPage_0); - - setTitle(Messages.TileConfigurationPage_1); - setMessage(Messages.TileConfigurationPage_2); - } - - /** - * @see WMSWizardPage#updateConfiguration(WMSConfiguration) - */ - @Override - public boolean updateConfiguration(WMSTileConfiguration configuration) { - if (isPageComplete()) { - configuration.setZoomLevels(zoomLevels.getIntValue()); - configuration.setMinTileSize(minTileSize.getIntValue()); - configuration.setMinMapSize(minMapSize.getIntValue()); - return true; - } - - return false; - } - - /** - * @see WMSWizardPage#createContent(Composite) - */ - @Override - public void createContent(Composite parent) { - Composite page = new Composite(parent, SWT.NONE); - - page.setLayout(new GridLayout(3, false)); - - // zoom levels - zoomLevels = new IntegerFieldEditor("ZoomLevels", Messages.TileConfigurationPage_4, page); //$NON-NLS-1$ - zoomLevels.setValidRange(1, 100); - zoomLevels.setStringValue(String.valueOf(getConfiguration().getZoomLevels())); - zoomLevels.setPage(this); - zoomLevels.setPropertyChangeListener(this); - final String zoomLevelsTip = Messages.TileConfigurationPage_3; - zoomLevels.getLabelControl(page).setToolTipText(zoomLevelsTip); - zoomLevels.getTextControl(page).setToolTipText(zoomLevelsTip); - zoomLevels.getTextControl(page).addFocusListener(new FocusListener() { - - @Override - public void focusLost(FocusEvent e) { - setMessage(null); - } - - @Override - public void focusGained(FocusEvent e) { - setMessage(zoomLevelsTip, INFORMATION); - } - }); - - // tile size - minTileSize = new IntegerFieldEditor("TileSize", Messages.TileConfigurationPage_6, page); //$NON-NLS-1$ - minTileSize.setValidRange(64, 1024); - minTileSize.setStringValue(String.valueOf(getConfiguration().getMinTileSize())); - minTileSize.setPage(this); - minTileSize.setPropertyChangeListener(this); - final String minTileSizeTip = Messages.TileConfigurationPage_5; - minTileSize.getLabelControl(page).setToolTipText(minTileSizeTip); - minTileSize.getTextControl(page).setToolTipText(minTileSizeTip); - minTileSize.getTextControl(page).addFocusListener(new FocusListener() { - - @Override - public void focusLost(FocusEvent e) { - setMessage(null); - } - - @Override - public void focusGained(FocusEvent e) { - setMessage(minTileSizeTip, INFORMATION); - } - }); - - // map size - minMapSize = new IntegerFieldEditor("MapSize", Messages.TileConfigurationPage_8, page); //$NON-NLS-1$ - minMapSize.setValidRange(64, 1024 * 64); - minMapSize.setStringValue(String.valueOf(getConfiguration().getMinMapSize())); - minMapSize.setPage(this); - minMapSize.setPropertyChangeListener(this); - final String minMapSizeTip = Messages.TileConfigurationPage_7; - minMapSize.getLabelControl(page).setToolTipText(minMapSizeTip); - minMapSize.getTextControl(page).setToolTipText(minMapSizeTip); - minMapSize.getTextControl(page).addFocusListener(new FocusListener() { - - @Override - public void focusLost(FocusEvent e) { - setMessage(null); - } - - @Override - public void focusGained(FocusEvent e) { - setMessage(minMapSizeTip, INFORMATION); - } - }); - - setControl(page); - - update(); - } - - private void update() { - setPageComplete(zoomLevels.isValid() && minTileSize.isValid() && minMapSize.isValid()); - } - - /** - * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent) - */ - @Override - public void propertyChange(PropertyChangeEvent event) { - if (event.getProperty().equals(FieldEditor.IS_VALID)) { - update(); - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/WMSLocationFieldEditor.java b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/WMSLocationFieldEditor.java deleted file mode 100644 index 25bee5fda9..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/WMSLocationFieldEditor.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server.wms.wizard.pages; - -import org.eclipse.jface.preference.StringFieldEditor; -import org.eclipse.swt.widgets.Display; - -import de.fhg.igd.mapviewer.concurrency.SwtCallback; -import de.fhg.igd.mapviewer.server.wms.capabilities.WMSUtil; -import de.fhg.igd.mapviewer.server.wms.wizard.pages.ConcurrentValidator.Validation; - -/** - * WMS location field editor - * - * @author Simon Templer - */ -public class WMSLocationFieldEditor extends StringFieldEditor { - - private final ConcurrentValidator validator; - - private boolean doValidation = true; - - /** - * Default constructor - * - * @param display the display - */ - public WMSLocationFieldEditor(Display display) { - super(); - - setValidateStrategy(StringFieldEditor.VALIDATE_ON_KEY_STROKE); - - validator = new ConcurrentValidator(new SwtCallback(display) { - - @Override - protected void error(Throwable e) { - setErrorMessage(e.getLocalizedMessage()); - updateState(); - } - - @Override - protected void finished(Boolean result) { - updateState(); - } - }, false); - } - - /** - * @see StringFieldEditor#doCheckState() - */ - @Override - protected boolean doCheckState() { - final String value = getStringValue(); - - if (doValidation) { - validator.runValidation(new Validation() { - - @Override - public boolean validate() throws Exception { - WMSUtil.getCapabilities(value); - return true; - } - }); - } - - return validator.isValid(); - } - - private void updateState() { - boolean oldState = isValid(); - - doValidation = false; - try { - refreshValidState(); - } catch (Exception e) { - // ignore - } - doValidation = true; - - boolean newState = isValid(); - if (oldState != newState) { - fireStateChanged(IS_VALID, oldState, newState); - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/messages.properties b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/messages.properties deleted file mode 100644 index 165b167fa6..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/messages.properties +++ /dev/null @@ -1,25 +0,0 @@ -BasicConfigurationPage_0=Basic Configuration -BasicConfigurationPage_1=Web Map Service -BasicConfigurationPage_2=Please specify the WMS to use. -BasicConfigurationPage_3=Name -BasicConfigurationPage_4=Service URL -WMSListConfigurationPage_0=Stored WMS -WMSListConfigurationPage_1=Stored WMS could not be loaded -WMSListConfigurationPage_2=Add to list -ConcurrentValidator_0=Validating... -LayerConfigurationPage_0=Layers -LayerConfigurationPage_1=Layers -LayerConfigurationPage_2=Select the layers to display, leave the field empty to display all layers. -LayerConfigurationPage_3=Layers -LayersDialog_0=Select the WMS layers to display. -LayersDialog_1=Layers -LayersDialog_2=Name -LayersDialog_3=Description -ServerNameFieldEditor_0=Invalid character: / -ServerNameFieldEditor_1=A WMS with the given name already exists -ResolutionConfigurationPage_0=Resolution for orthophotos -ResolutionConfigurationPage_1=Select the desired resolution for your orthophotos. -ResolutionConfigurationPage_2=Size for X in pixel -ResolutionConfigurationPage_3=Set your desired size for X in pixel -ResolutionConfigurationPage_4=Size for Y in pixel -ResolutionConfigurationPage_5=Set your desired size for Y in pixel diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/messages_de.properties b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/messages_de.properties deleted file mode 100644 index 8edab4d177..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/src/de/fhg/igd/mapviewer/server/wms/wizard/pages/messages_de.properties +++ /dev/null @@ -1,26 +0,0 @@ -BasicConfigurationPage_0=Basiskonfiguration -BasicConfigurationPage_1=Web Map Service -BasicConfigurationPage_2=Bitte geben Sie den zu nutzenden WMS an. -BasicConfigurationPage_3=Name -BasicConfigurationPage_4=Service URL -WMSListConfigurationPage_0=Vorhandene WMS -WMSListConfigurationPage_1=Gespeicherte WMS konnten nicht geladen werden -WMSListConfigurationPage_2=Zur Liste hinzufügen -ConcurrentValidator_0=Validiere... -LayerConfigurationPage_0=Layer -LayerConfigurationPage_1=Layer -LayerConfigurationPage_2=Geben Sie die anzuzeigenden Layer an, lassen Sie das Feld leer um alle Layer anzuzeigen. -LayerConfigurationPage_3=Layer -LayersDialog_0=Wählen Sie die anzuzeigenden Layer. -LayersDialog_1=Layer -LayersDialog_2=Name -LayersDialog_3=Beschreibung -ServerNameFieldEditor_0=Ungültiges Zeichen: / -ServerNameFieldEditor_1=Eine WMS-Karte mit dem angegebenen Namen existiert bereits -ResolutionConfigurationPage_0=Auflösung für Orthophotos -ResolutionConfigurationPage_1=Geben Sie hier die gewünschte Auflösung für die Orthophotos ein. -ResolutionConfigurationPage_2=Größe von X in Pixeln -ResolutionConfigurationPage_3=Gewünschte Größe für X in Pixeln -ResolutionConfigurationPage_4=Größe von Y in Pixeln -ResolutionConfigurationPage_5=Gewünschte Größe für Y in Pixeln - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.classpath b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.project b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.project deleted file mode 100644 index 4194bd9a3d..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - de.fhg.igd.mapviewer.tools.boxzoom - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/edu.umd.cs.findbugs.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 58ce6d564e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.core.resources.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index ff635dadef..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.jdt.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ab99a2ded1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,428 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.jdt.groovy.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.jdt.launching.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 706de46d84..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.jdt.ui.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index b90cfe5125..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,68 +0,0 @@ -#Updated from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com;de; -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.pde.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 03a590f36b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Thu Jul 09 10:40:38 CEST 2009 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.pde.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/META-INF/MANIFEST.MF deleted file mode 100644 index ec63d7775b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Box Zoom Tool -Bundle-SymbolicName: de.fhg.igd.mapviewer.tools.boxzoom;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-Vendor: Fraunhofer IGD -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: de.fhg.igd.mapviewer;version="1.0.0", - de.fhg.igd.mapviewer.tools;version="1.0.0", - de.fhg.igd.mapviewer.tools.renderer;version="1.0.0", - de.fhg.igd.mapviewer.view.arecalculation, - org.jdesktop.swingx, - org.jdesktop.swingx.mapviewer;version="1.0.0" -Automatic-Module-Name: de.fhg.igd.mapviewer.tools.boxzoom diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/OSGI-INF/l10n/bundle.properties b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/OSGI-INF/l10n/bundle.properties deleted file mode 100644 index 65fa49ac24..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/OSGI-INF/l10n/bundle.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Properties file for de.fhg.igd.mapviewer.tools.boxzoom -tool.description =

Draw a rectangle and zoom in
Left click: Set a corner of the rectangle
Right click: Cancel

-tool.name = Zoom \ No newline at end of file diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/OSGI-INF/l10n/bundle_de.properties b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/OSGI-INF/l10n/bundle_de.properties deleted file mode 100644 index 4bb1de6f6f..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/OSGI-INF/l10n/bundle_de.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Properties file for de.fhg.igd.mapviewer.tools.boxzoom -tool.description =

Rechteck aufspannen und zoomen
Linksklick: Ecke des Rechtecks bestimmen
Rechtsklick: Abbrechen

-tool.name = Zoom \ No newline at end of file diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/build.properties b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/build.properties deleted file mode 100644 index 7f3d98ef4b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - OSGI-INF/,\ - images/ diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/images/zoom2.png b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/images/zoom2.png deleted file mode 100644 index bffac7eb33..0000000000 Binary files a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/images/zoom2.png and /dev/null differ diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/plugin.xml b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/plugin.xml deleted file mode 100644 index 945c2cb3cc..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/plugin.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/src/de/fhg/igd/mapviewer/tools/boxzoom/BoxZoomTool.java b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/src/de/fhg/igd/mapviewer/tools/boxzoom/BoxZoomTool.java deleted file mode 100644 index 1f95ac4dc2..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/src/de/fhg/igd/mapviewer/tools/boxzoom/BoxZoomTool.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.tools.boxzoom; - -import java.awt.Color; -import java.awt.Cursor; -import java.awt.event.MouseEvent; -import java.util.HashSet; - -import org.jdesktop.swingx.mapviewer.GeoPosition; - -import de.fhg.igd.mapviewer.MapTool; -import de.fhg.igd.mapviewer.tools.AbstractMapTool; -import de.fhg.igd.mapviewer.tools.renderer.BoxRenderer; -import de.fhg.igd.mapviewer.view.arecalculation.AreaCalc; - -/** - * BoxZoomTool - * - * @author Simon Templer - * - * @version $Id$ - */ -public class BoxZoomTool extends AbstractMapTool { - - /** - * Creates a {@link BoxZoomTool} - */ - public BoxZoomTool() { - BoxRenderer renderer = new BoxRenderer(); - - renderer.setBackColor(new Color(79, 79, 79, 100)); - renderer.setBorderColor(new Color(79, 79, 79, 255)); - - setRenderer(renderer); - } - - /** - * @see AbstractMapTool#click(MouseEvent, GeoPosition) - */ - @Override - public void click(MouseEvent me, GeoPosition pos) { - // set selection type FIXME there should another mechanism for this, not - // needing a dependency to AreaCalc - AreaCalc.getInstance().setSelectionType("rectangle"); - - if (me.getClickCount() == 1) { - if (getPositions().size() < 1) { - // add pos - addPosition(pos); - } - else { - // action & reset - addPosition(pos); - mapKit.zoomToPositions(new HashSet(getPositions())); - reset(); - } - } - } - - /** - * @see AbstractMapTool#popup(MouseEvent, GeoPosition) - */ - @Override - public void popup(MouseEvent me, GeoPosition pos) { - reset(); - } - - /** - * @see AbstractMapTool#pressed(MouseEvent, GeoPosition) - */ - @Override - public void pressed(MouseEvent me, GeoPosition pos) { - // ignore - } - - /** - * @see AbstractMapTool#released(MouseEvent, GeoPosition) - */ - @Override - public void released(MouseEvent me, GeoPosition pos) { - // ignore - } - - /** - * @see AbstractMapTool#getCursor() - */ - @Override - public Cursor getCursor() { - return Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR); - } - - /** - * @see MapTool#isPanEnabled() - */ - @Override - public boolean isPanEnabled() { - return true; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.classpath b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.project b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.project deleted file mode 100644 index 4962e4bab4..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - de.fhg.igd.mapviewer.tools.default - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/edu.umd.cs.findbugs.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 58ce6d564e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.core.resources.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index ff635dadef..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.jdt.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ab99a2ded1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,428 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.jdt.groovy.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.jdt.launching.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 706de46d84..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.jdt.ui.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index b90cfe5125..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,68 +0,0 @@ -#Updated from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com;de; -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.pde.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 56e987f861..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Thu Jul 09 11:28:05 CEST 2009 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.pde.prefs b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/META-INF/MANIFEST.MF deleted file mode 100644 index aaa8b0fc6c..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/META-INF/MANIFEST.MF +++ /dev/null @@ -1,12 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Default Tool -Bundle-SymbolicName: de.fhg.igd.mapviewer.tools.default;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-Vendor: Fraunhofer IGD -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: de.fhg.igd.mapviewer;version="1.0.0", - de.fhg.igd.mapviewer.tools;version="1.0.0", - org.jdesktop.swingx, - org.jdesktop.swingx.mapviewer;version="1.0.0" -Automatic-Module-Name: de.fhg.igd.mapviewer.tools.default diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/OSGI-INF/l10n/bundle.properties b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/OSGI-INF/l10n/bundle.properties deleted file mode 100644 index 2d38f07823..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/OSGI-INF/l10n/bundle.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Properties file for de.fhg.igd.mapviewer.tools.default -tool.description =

Pointer
Double click: Center on a position and zoom in one level

-tool.name = Pointer \ No newline at end of file diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/OSGI-INF/l10n/bundle_de.properties b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/OSGI-INF/l10n/bundle_de.properties deleted file mode 100644 index 0432ae4d58..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/OSGI-INF/l10n/bundle_de.properties +++ /dev/null @@ -1,3 +0,0 @@ -#Properties file for de.fhg.igd.mapviewer.tools.default -tool.description =

Zeiger
Doppelklick: Zentrieren und eine Stufe heranzoomen

-tool.name = Zeiger \ No newline at end of file diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/build.properties b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/build.properties deleted file mode 100644 index 7f3d98ef4b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/build.properties +++ /dev/null @@ -1,7 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - OSGI-INF/,\ - images/ diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/images/pointer.png b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/images/pointer.png deleted file mode 100644 index 83d433336a..0000000000 Binary files a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/images/pointer.png and /dev/null differ diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/plugin.xml b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/plugin.xml deleted file mode 100644 index 5dfe68e6e9..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/plugin.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/src/de/fhg/igd/mapviewer/tools/pointer/PointerTool.java b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/src/de/fhg/igd/mapviewer/tools/pointer/PointerTool.java deleted file mode 100644 index 9dab195dd9..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/src/de/fhg/igd/mapviewer/tools/pointer/PointerTool.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.tools.pointer; - -import java.awt.event.MouseEvent; - -import org.jdesktop.swingx.mapviewer.GeoPosition; - -import de.fhg.igd.mapviewer.MapTool; -import de.fhg.igd.mapviewer.tools.AbstractMapTool; - -/** - * Tool that does nothing - * - * @author Simon Templer - * - * @version $Id$ - */ -public class PointerTool extends AbstractMapTool { - - /** - * @see AbstractMapTool#click(MouseEvent, GeoPosition) - */ - @Override - public void click(MouseEvent me, GeoPosition pos) { - if (me.getClickCount() == 2) { - mapKit.setCenterPosition(pos); - mapKit.setZoom(mapKit.getMainMap().getZoom() - 1); - } - } - - /** - * @see AbstractMapTool#popup(MouseEvent, GeoPosition) - */ - @Override - public void popup(MouseEvent me, GeoPosition pos) { - // ignore - } - - /** - * @see AbstractMapTool#released(MouseEvent, GeoPosition) - */ - @Override - public void released(MouseEvent me, GeoPosition pos) { - // ignore - } - - /** - * @see AbstractMapTool#pressed(MouseEvent, GeoPosition) - */ - @Override - public void pressed(MouseEvent me, GeoPosition pos) { - // ignore - } - - /** - * @see MapTool#isPanEnabled() - */ - @Override - public boolean isPanEnabled() { - return true; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/.classpath b/ext/styledmap/de.fhg.igd.mapviewer/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer/.project b/ext/styledmap/de.fhg.igd.mapviewer/.project deleted file mode 100644 index f9233f3864..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - de.fhg.igd.mapviewer - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer/.settings/edu.umd.cs.findbugs.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 58ce6d564e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.core.resources.prefs b/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index ff635dadef..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.jdt.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ab99a2ded1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,428 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.jdt.groovy.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.jdt.launching.prefs b/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 706de46d84..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.jdt.ui.prefs b/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index b90cfe5125..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,68 +0,0 @@ -#Updated from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com;de; -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.pde.core.prefs b/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 17b01758d6..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Wed Jul 08 09:01:52 CEST 2009 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.pde.prefs b/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/ext/styledmap/de.fhg.igd.mapviewer/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer/META-INF/MANIFEST.MF deleted file mode 100644 index e918d5e37e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/META-INF/MANIFEST.MF +++ /dev/null @@ -1,72 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Mapviewer -Bundle-SymbolicName: de.fhg.igd.mapviewer;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-Vendor: Fraunhofer IGD -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.base, - com.google.common.collect, - de.fhg.igd.eclipse.ui.util.extension, - de.fhg.igd.eclipse.ui.util.extension.exclusive, - de.fhg.igd.eclipse.ui.util.extension.selective, - de.fhg.igd.eclipse.util.extension, - de.fhg.igd.eclipse.util.extension.exclusive, - de.fhg.igd.eclipse.util.extension.selective, - de.fhg.igd.geom, - de.fhg.igd.geom.algorithm, - de.fhg.igd.geom.algorithm.sweepline, - de.fhg.igd.geom.indices, - de.fhg.igd.geom.shape, - de.fhg.igd.geom.util, - de.fhg.igd.osgi.util;version="1.0.0", - de.fhg.igd.slf4jplus, - de.fhg.igd.swingrcp;version="1.0.0", - edu.umd.cs.findbugs.annotations, - gnu.trove, - javax.measure, - javax.measure.quantity, - org.apache.commons.beanutils;version="1.7.0", - org.apache.commons.io;version="1.4.0", - org.apache.commons.logging, - org.eclipse.core.commands.common, - org.eclipse.core.runtime;version="3.4.0", - org.eclipse.jface.action, - org.eclipse.swt.widgets, - org.geotools.referencing;version="29.1.0.combined", - org.geotools.referencing.crs;version="29.1.0.combined", - org.jdesktop.swingx.graphics, - org.jdesktop.swingx.mapviewer;version="1.0.0", - org.jdesktop.swingx.mapviewer.empty;version="1.0.0", - org.jdesktop.swingx.painter, - org.locationtech.jts.geom;version="1.13.0", - org.locationtech.jts.geom.impl;version="1.13.0", - org.opengis.referencing, - org.opengis.referencing.crs, - org.opengis.referencing.cs, - org.osgi.framework;version="1.3.0", - org.slf4j -Export-Package: de.fhg.igd.mapviewer;version="1.0.0", - de.fhg.igd.mapviewer.cache, - de.fhg.igd.mapviewer.concurrency, - de.fhg.igd.mapviewer.images, - de.fhg.igd.mapviewer.marker;version="1.0.0", - de.fhg.igd.mapviewer.marker.area, - de.fhg.igd.mapviewer.painter, - de.fhg.igd.mapviewer.server;version="1.0.0", - de.fhg.igd.mapviewer.tip, - de.fhg.igd.mapviewer.tools;version="1.0.0", - de.fhg.igd.mapviewer.tools.renderer;version="1.0.0", - de.fhg.igd.mapviewer.view;version="1.0.0", - de.fhg.igd.mapviewer.view.arecalculation, - de.fhg.igd.mapviewer.view.cache, - de.fhg.igd.mapviewer.view.overlay;version="1.0.0", - de.fhg.igd.mapviewer.view.preferences, - de.fhg.igd.mapviewer.view.server, - de.fhg.igd.mapviewer.waypoints;version="1.0.0" -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.springframework.spring-core;bundle-version="5.2.0" -Bundle-ActivationPolicy: lazy -Bundle-Activator: de.fhg.igd.mapviewer.view.MapviewerPlugin -Automatic-Module-Name: de.fhg.igd.mapviewer diff --git a/ext/styledmap/de.fhg.igd.mapviewer/OSGI-INF/l10n/bundle.properties b/ext/styledmap/de.fhg.igd.mapviewer/OSGI-INF/l10n/bundle.properties deleted file mode 100644 index 588109c64e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/OSGI-INF/l10n/bundle.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Properties file for de.fhg.igd.mapviewer -view.name = Map -converter.targetName = Map area -cache.name = Memory only -cache.name.0 = Filesystem \ No newline at end of file diff --git a/ext/styledmap/de.fhg.igd.mapviewer/OSGI-INF/l10n/bundle_de.properties b/ext/styledmap/de.fhg.igd.mapviewer/OSGI-INF/l10n/bundle_de.properties deleted file mode 100644 index 6c999b0a90..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/OSGI-INF/l10n/bundle_de.properties +++ /dev/null @@ -1,5 +0,0 @@ -#Properties file for de.fhg.igd.mapviewer -view.name = Karte -converter.targetName = Kartenausschnitt -cache.name = Nur im Arbeitsspeicher -cache.name.0 = Dateisystem \ No newline at end of file diff --git a/ext/styledmap/de.fhg.igd.mapviewer/build.properties b/ext/styledmap/de.fhg.igd.mapviewer/build.properties deleted file mode 100644 index 0f453643e5..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - images/,\ - OSGI-INF/,\ - schema/ diff --git a/ext/styledmap/de.fhg.igd.mapviewer/images/world.gif b/ext/styledmap/de.fhg.igd.mapviewer/images/world.gif deleted file mode 100644 index ec6cca4525..0000000000 Binary files a/ext/styledmap/de.fhg.igd.mapviewer/images/world.gif and /dev/null differ diff --git a/ext/styledmap/de.fhg.igd.mapviewer/plugin.xml b/ext/styledmap/de.fhg.igd.mapviewer/plugin.xml deleted file mode 100644 index 23ec1cf5d1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/plugin.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.MapPainter.exsd b/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.MapPainter.exsd deleted file mode 100644 index eea878255e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.MapPainter.exsd +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - Extension point for map painters - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Class that implements the MapPainter interface - - - - - - - - - - - - - - - 1.0.0 - - - - - - - - - [Enter extension point usage example here.] - - - - - - - - - [Enter API information here.] - - - - - - - - - [Enter information about supplied implementation of this extension point.] - - - - - - - - - Fraunhofer IGD 2009 - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.MapTool.exsd b/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.MapTool.exsd deleted file mode 100644 index bfd392f1cc..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.MapTool.exsd +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - Extension point for map tools - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A class that extends the AbstractMapTool - - - - - - - - - - Priority number, default is zero - - - - - - - - - - - - 1.0.0 - - - - - - - - - [Enter extension point usage example here.] - - - - - - - - - [Enter API information here.] - - - - - - - - - [Enter information about supplied implementation of this extension point.] - - - - - - - - - Fraunhofer IGD 2009 - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.TileCache.exsd b/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.TileCache.exsd deleted file mode 100644 index 2a523a1f26..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.TileCache.exsd +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - [Enter description of this extension point.] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A TileCache implementation with a default constructor - - - - - - - - - - - - - - - - - - - - - - [Enter the first release in which this extension point appears.] - - - - - - - - - [Enter extension point usage example here.] - - - - - - - - - [Enter API information here.] - - - - - - - - - [Enter information about supplied implementation of this extension point.] - - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.TileOverlayPainter.exsd b/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.TileOverlayPainter.exsd deleted file mode 100644 index 90c760c081..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.TileOverlayPainter.exsd +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - Extension point for tile overlay painters - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.0.0 - - - - - - - - - [Enter extension point usage example here.] - - - - - - - - - [Enter API information here.] - - - - - - - - - [Enter information about supplied implementation of this extension point.] - - - - - - - - - Fraunhofer IGD 2009 - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.server.MapServer.exsd b/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.server.MapServer.exsd deleted file mode 100644 index 0b1063d9ae..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.server.MapServer.exsd +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - Extension point for map servers - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Map server name - - - - - - - Class that extends the MapServer type - - - - - - - - - - If the map server is enabled - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.0.0 - - - - - - - - - [Enter extension point usage example here.] - - - - - - - - - [Enter API information here.] - - - - - - - - - [Enter information about supplied implementation of this extension point.] - - - - - - - - - Fraunhofer IGD 2009 - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.view.MapViewExtension.exsd b/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.view.MapViewExtension.exsd deleted file mode 100644 index a4de886c4f..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/schema/de.fhg.igd.mapviewer.view.MapViewExtension.exsd +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - Extension point for map view extensions - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1.0.0 - - - - - - - - - [Enter extension point usage example here.] - - - - - - - - - [Enter API information here.] - - - - - - - - - [Enter information about supplied implementation of this extension point.] - - - - - - - - - Fraunhofer IGD 2009 - - - - diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/AbstractTileOverlayPainter.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/AbstractTileOverlayPainter.java deleted file mode 100644 index 4f918f6b56..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/AbstractTileOverlayPainter.java +++ /dev/null @@ -1,796 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer; - -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.RenderingHints; -import java.awt.geom.Point2D; -import java.awt.image.BufferedImage; -import java.awt.image.BufferedImageOp; -import java.io.IOException; -import java.lang.ref.SoftReference; -import java.util.Deque; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Set; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import javax.imageio.ImageIO; -import javax.swing.SwingUtilities; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.graphics.GraphicsUtilities; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.PixelConverter; -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; -import org.jdesktop.swingx.mapviewer.TileProvider; - -import gnu.trove.TIntHashSet; -import gnu.trove.TIntIterator; -import gnu.trove.TIntObjectHashMap; -import gnu.trove.TIntObjectProcedure; - -/** - * Abstract tile overlay painter base class. - * - * @author Simon Templer - */ -public abstract class AbstractTileOverlayPainter implements TileOverlayPainter { - - /** - * Delegates tile painting - */ - private class TilePaintDelegate { - - private final int x; - private final int y; - private final int tilePosX; - private final int tilePosY; - private final int tileWidth; - private final int tileHeight; - private final PixelConverter converter; - private final int zoom; - - /** - * Creates a tile paint delegate - * - * @param x the tile x number - * @param y the tile y number - * @param tilePosX the tile x position in pixel - * @param tilePosY the tile y position in pixel - * @param tileWidth the tile width - * @param tileHeight the tile height - * @param converter the pixel converter - * @param zoom the zoom level - */ - public TilePaintDelegate(int x, int y, int tilePosX, int tilePosY, int tileWidth, - int tileHeight, PixelConverter converter, int zoom) { - this.x = x; - this.y = y; - this.tilePosX = tilePosX; - this.tilePosY = tilePosY; - this.tileWidth = tileWidth; - this.tileHeight = tileHeight; - this.converter = converter; - this.zoom = zoom; - } - - /** - * Paint the tile - */ - public void paintTile() { - BufferedImage img = repaintTile(tilePosX, tilePosY, tileWidth, tileHeight, converter, - zoom); - if (img == null) { - cacheTile(x, y, zoom, emptyImage); - } - else { - cacheTile(x, y, zoom, img); - } - - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - repaint(); - } - }); - } - - } - - /** - * Refresher - */ - public class DefaultRefresher implements Refresher { - - // private TIntObjectHashMap tileMap = new - // TIntObjectHashMap(); - private final TIntObjectHashMap> tileMap = new TIntObjectHashMap>(); - - private final TileProvider tiles; - - private final int minZoom; - private final int maxZoom; - - private final int tileWidth; - private final int tileHeight; - - private final boolean removeCached; - - private boolean valid = true; - - private BufferedImageOp imageOp; - - /** - * Constructor - * - * @param tiles the tile provider - * @param removeCached if the cached tiles shall be removed - */ - public DefaultRefresher(TileProvider tiles, boolean removeCached) { - this.tiles = tiles; - this.removeCached = removeCached; - - if (tiles != null) { - minZoom = tiles.getMinimumZoom(); - maxZoom = tiles.getTotalMapZoom(); - - tileWidth = tiles.getTileWidth(minZoom); - tileHeight = tiles.getTileHeight(minZoom); - } - else { - minZoom = maxZoom = tileWidth = tileHeight = 0; - } - } - - @Override - public void setImageOp(BufferedImageOp imageOp) { - this.imageOp = imageOp; - } - - @Override - public void addPosition(GeoPosition pos) { - if (tiles == null) - return; - - try { - Point2D point = tiles.getConverter().geoToPixel(pos, minZoom); - - int x = (int) point.getX(); - int y = (int) point.getY(); - - for (int zoom = minZoom; zoom <= maxZoom; zoom++) { - addOverlappingTiles(zoom, x, y); - - x = x / 2; - y = y / 2; - } - } catch (IllegalGeoPositionException e) { - log.trace("Error adding position to refresher", e); //$NON-NLS-1$ - } - } - - /** - * Add tiles for the given pixel coordinates, also regarding a possible - * overlap - * - * @param zoom the zoom level - * @param x the pixel x ordinate - * @param y the pixel y ordinate - */ - private void addOverlappingTiles(int zoom, int x, int y) { - int overlap = getMaxOverlap(); - - addTileByPixel(zoom, x + overlap, y + overlap); - addTileByPixel(zoom, x - overlap, y + overlap); - addTileByPixel(zoom, x - overlap, y - overlap); - addTileByPixel(zoom, x + overlap, y - overlap); - } - - @Override - public void addArea(GeoPosition topLeft, GeoPosition bottomRight) { - if (tiles == null) - return; - - // for each zoom level - for (int zoom = minZoom; zoom <= maxZoom; zoom++) { - // add tiles that represent the area - try { - int overlap = getMaxOverlap(); - - Point2D p1 = tiles.getConverter().geoToPixel(topLeft, zoom); - Point2D p2 = tiles.getConverter().geoToPixel(bottomRight, zoom); - - int firstTileX = (int) Math.min(p1.getX() - overlap, p2.getX() - overlap) - / tileWidth; - int firstTileY = (int) Math.min(p1.getY() - overlap, p2.getY() - overlap) - / tileHeight; - int lastTileX = (int) Math.max(p1.getX() + overlap, p2.getX() + overlap) - / tileWidth; - int lastTileY = (int) Math.max(p1.getY() + overlap, p2.getY() + overlap) - / tileHeight; - - // add all identified tiles - for (int tileX = firstTileX; tileX <= lastTileX; tileX++) { - for (int tileY = firstTileY; tileY <= lastTileY; tileY++) { - addTile(zoom, tileX, tileY); - } - } - } catch (IllegalGeoPositionException e) { - log.trace("Error adding area to refresher"); - } - } - } - - private void addTileByPixel(int zoom, int pixelX, int pixelY) { - int tileX = pixelX / tileWidth; - int tileY = pixelY / tileHeight; - - addTile(zoom, tileX, tileY); - } - - private void addTile(int zoom, int tileX, int tileY) { - TIntObjectHashMap zoomMap = tileMap.get(zoom); - if (zoomMap == null) { - zoomMap = new TIntObjectHashMap(); - tileMap.put(zoom, zoomMap); - } - - TIntHashSet ySet = zoomMap.get(tileX); - if (ySet == null) { - ySet = new TIntHashSet(); - zoomMap.put(tileX, ySet); - } - - ySet.add(tileY); - } - - @Override - public void execute() { - if (tiles == null) - return; - - if (valid && tiles == AbstractTileOverlayPainter.this.tiles) { - // execution only possible once - valid = false; - synchronized (refreshers) { - refreshers.remove(this); - } - - if (tileMap.isEmpty()) { - return; - } - - synchronized (cache) { - // for each zoom level - for (int zoom = minZoom; zoom <= tiles.getTotalMapZoom(); zoom++) { - final TIntObjectHashMap>> zoomCache = cache - .get(zoom); - final int fZoom = zoom; - final Rectangle viewBounds = getCurrentViewBounds(zoom); - - if (zoomCache != null) { - // if there are any cached tiles at the given zoom - // level - - TIntObjectHashMap zoomMap = tileMap.get(zoom); - if (zoomMap != null) { - - // process tile map - zoomMap.forEachEntry(new TIntObjectProcedure() { - - @Override - public boolean execute(int x, final TIntHashSet ySet) { - final TIntObjectHashMap> xCache = zoomCache - .get(x); - - if (xCache != null) { - TIntIterator it = ySet.iterator(); - while (it.hasNext()) { - int y = it.next(); - - if (removeCached || !isCurrentZoom(fZoom) - || !insideView(viewBounds, x, y)) { - // remove cached tile - xCache.remove(y); - } - else { - /* - * Only schedule repaint - * where the cache is not - * removed and at current - * zoom level. - */ - - // only schedule repaint for - // tiles that actually have - // a cached image - SoftReference imgRef = xCache - .get(y); - if (imgRef != null && imgRef.get() != null) { - if (imageOp != null) { - // apply image - // operation to - // invalidated image - BufferedImage img = imgRef.get(); - if (img != null) { - img = imageOp.filter(img, null); - xCache.put(y, - new SoftReference( - img)); - } - } - - int tilePosX = tileWidth * x; - int tilePosY = tileHeight * y; - TilePaintDelegate paint = new TilePaintDelegate( - x, y, tilePosX, tilePosY, tileWidth, - tileHeight, tiles.getConverter(), - fZoom); - scheduleTileRepaint(paint); - } - } - } - } - - return true; - } - - }); - - } - } - } - } - repaint(); - } - } - - /** - * Determines if a tile is visible in the given view bounds. - * - * @param viewBounds the view bounds, may be null if - * unknown - * @param x the tile x ordinate - * @param y the tile y ordinate - * @return if the tile is visible in the view bounds - */ - protected boolean insideView(Rectangle viewBounds, int x, int y) { - if (viewBounds == null) { - return false; - } - - if (x * tileWidth > viewBounds.x + viewBounds.width) { - // tile lies to the right of the view - return false; - } - if ((x + 1) * tileWidth < viewBounds.x) { - // tile lies to the left of the view - return false; - } - if (y * tileHeight > viewBounds.y + viewBounds.height) { - // tile lies below the view - return false; - } - if ((y + 1) * tileHeight < viewBounds.y) { - // tile lies above the view - return false; - } - - return true; - } - - /** - * Invalidate the refresher - */ - protected final void invalidate() { - valid = false; - } - - } - - private static final Log log = LogFactory.getLog(AbstractTileOverlayPainter.class); - - /** - * Default priority - */ - public static final int DEF_PRIORITY = 5; - - private final BufferedImage emptyImage = GraphicsUtilities.createCompatibleTranslucentImage(1, - 1); - - private final BufferedImage loadingImage; - - private final TIntObjectHashMap>>> cache = new TIntObjectHashMap>>>(); - - private final Set refreshers = new HashSet(); - - private TileProvider tiles; - - private boolean antialiasing = true; - - private int priority = DEF_PRIORITY; - - /** - * The executor for tile painting - */ - private final ExecutorService executor; - - private final Deque repaintQueue = new LinkedList(); - - /** - * Constructor - * - * @param numberOfThreads the number of worker threads to use for tile - * painting - */ - public AbstractTileOverlayPainter(int numberOfThreads) { - try { - loadingImage = ImageIO - .read(AbstractTileOverlayPainter.class.getResource("images/loading.png")); - } catch (IOException e) { - throw new IllegalStateException("Could not load loading image"); - } - - if (numberOfThreads > 1) { - executor = Executors.newFixedThreadPool(4); - } - else { - executor = Executors.newSingleThreadExecutor(); - } - } - - /** - * @param antialiasing if antialiasing should be used for the painter - */ - public void setAntialiasing(boolean antialiasing) { - this.antialiasing = antialiasing; - } - - /** - * @see TileOverlayPainter#setTileProvider(org.jdesktop.swingx.mapviewer.TileProvider) - */ - @Override - public void setTileProvider(TileProvider tiles) { - this.tiles = tiles; - - clearAll(); - } - - /** - * Clear all tiles and other temporary objects - */ - private void clearAll() { - synchronized (refreshers) { - // invalidate refreshers (important for tile provider change) - for (DefaultRefresher refresher : refreshers) { - refresher.invalidate(); - } - - refreshers.clear(); - } - - synchronized (cache) { - cache.clear(); - } - - synchronized (repaintQueue) { - repaintQueue.clear(); - } - } - - /** - * Refresh all tiles - */ - public void refreshAll() { - clearAll(); - repaint(); - } - - /** - * Prepare a refresh - * - * @return the refresher - */ - public Refresher prepareRefresh() { - return prepareRefresh(true); - } - - /** - * Get if the given zoom level is the current zoom level - * - * @param zoom the zoom level - * @return if it is the current zoom level - */ - protected abstract boolean isCurrentZoom(int zoom); - - /** - * Get the bounds of the current view of the map. - * - * @param zoom the current assumed zoom level - * @return the view bounds (in world pixel coordinates) or null - * if it is not known or the zoom level does not match - */ - protected abstract Rectangle getCurrentViewBounds(int zoom); - - /** - * Prepare a refresh - * - * @param removeCached if the changed cached tiles shall be removed - * @return the refresher - */ - public Refresher prepareRefresh(boolean removeCached) { - DefaultRefresher defaultRefresher = new DefaultRefresher(tiles, removeCached); - synchronized (refreshers) { - refreshers.add(defaultRefresher); - } - return defaultRefresher; - } - - /** - * Initiate a repaint - */ - protected abstract void repaint(); - - /** - * Get the maximum overlap for painted way-points in pixel - * - * @return the maximum overlap for painted way-points in pixel - */ - protected abstract int getMaxOverlap(); - - /** - * @see TileOverlayPainter#paintTile(Graphics2D, int, int, int, int, int, - * int, int, PixelConverter, Rectangle) - */ - @Override - public void paintTile(final Graphics2D gfx, final int x, final int y, final int zoom, - final int tilePosX, final int tilePosY, final int tileWidth, final int tileHeight, - final PixelConverter converter, Rectangle viewportBounds) { - BufferedImage img; - synchronized (this) { - img = getCachedTile(x, y, zoom); - - if (img == null) { - // start tile creation - - // temporarily set empty image TODO load image? - img = loadingImage; - cacheTile(x, y, zoom, img); - - TilePaintDelegate paint = new TilePaintDelegate(x, y, tilePosX, tilePosY, tileWidth, - tileHeight, converter, zoom); - scheduleTileRepaint(paint); - } - } - - if (img == loadingImage) { - configureGraphics(gfx); - gfx.drawImage(img, (tileWidth - img.getWidth()) / 2, (tileHeight - img.getHeight()) / 2, - null); - } - else if (img != null && img != emptyImage) { - configureGraphics(gfx); - drawOverlay(gfx, img, zoom, tilePosX, tilePosY, tileWidth, tileHeight, viewportBounds, - converter); - } - } - - /** - * Draws the overlay image on a tile. - * - * @param gfx the graphics to draw the overlay on (with the origin being the - * at the upper left corner of the tile) - * @param img the overlay image - * @param zoom the current zoom level - * @param tilePosX the tile x position in world pixel coordinates - * @param tilePosY the tile y position in world pixel coordinates - * @param tileWidth the tile width - * @param tileHeight the tile height - * @param viewportBounds the view-port bounds - * @param converter the pixel converter - */ - protected void drawOverlay(Graphics2D gfx, BufferedImage img, int zoom, int tilePosX, - int tilePosY, int tileWidth, int tileHeight, Rectangle viewportBounds, - PixelConverter converter) { - gfx.drawImage(img, 0, 0, null); - } - - /** - * Schedule a tile repaint after the {@link #repaintQueue} has been changed - * - * @param paint the tile paint delegate - */ - private void scheduleTileRepaint(TilePaintDelegate paint) { - synchronized (repaintQueue) { - repaintQueue.addFirst(paint); - } - - executor.execute(new Runnable() { - - @Override - public void run() { - TilePaintDelegate paint = null; - synchronized (repaintQueue) { - if (!repaintQueue.isEmpty()) { - paint = repaintQueue.pop(); - } - } - if (paint != null) { - paint.paintTile(); - } - } - }); - } - - /** - * Create a translucent image - * - * @param width the width - * @param height the height - * @return a translucent image - */ - protected BufferedImage createImage(final int width, final int height) { - return GraphicsUtilities.createCompatibleTranslucentImage(width, height); - } - - private BufferedImage getCachedTile(int x, int y, int zoom) { - BufferedImage result = null; - - synchronized (cache) { - // cache per zoom - final TIntObjectHashMap>> zoomCache = cache - .get(zoom); - - if (zoomCache != null) { - // cache per x - final TIntObjectHashMap> xCache = zoomCache.get(x); - if (xCache != null) { - // img cache - final SoftReference imgCache = xCache.get(y); - if (imgCache != null) { - result = imgCache.get(); - } - } - } - } - - return result; - } - - private void cacheTile(int x, int y, int zoom, BufferedImage img) { - synchronized (cache) { - // cache per zoom - TIntObjectHashMap>> zoomCache = cache - .get(zoom); - if (zoomCache == null) { - zoomCache = new TIntObjectHashMap>>(); - cache.put(zoom, zoomCache); - } - - // cache per x - TIntObjectHashMap> xCache = zoomCache.get(x); - if (xCache == null) { - xCache = new TIntObjectHashMap>(); - zoomCache.put(x, xCache); - } - - // image cache - xCache.put(y, new SoftReference(img)); - } - } - - /** - * Paint a tile. Use {@link #createImage(int, int)} to create an image to - * paint on. - * - * @param posX the x position of the tile in world pixels - * @param posY the y position of the tile in world pixels - * @param width the tile width - * @param height the tile height - * @param converter the converter - * @param zoom the zoom level - * - * @return the painted image tile or null (represents the empty image) - */ - public abstract BufferedImage repaintTile(int posX, int posY, int width, int height, - PixelConverter converter, int zoom); - - /** - * Configure the given graphics - * - * @param gfx the graphics device - */ - protected void configureGraphics(Graphics2D gfx) { - if (antialiasing) { - gfx.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); - } - else { - gfx.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_OFF); - } - } - - /** - * Get the painter priority, painters with higher priority will be painted - * later - * - * @return the priority - */ - public int getPriority() { - return priority; - } - - /** - * @param priority the priority to set - */ - public void setPriority(int priority) { - this.priority = priority; - } - - /** - * @see java.lang.Comparable#compareTo(java.lang.Object) - */ - @Override - public int compareTo(TileOverlayPainter other) { - if (this == other) - return 0; - - if (other instanceof AbstractTileOverlayPainter) { - int priority = getPriority(); - int otherPriority = ((AbstractTileOverlayPainter) other).getPriority(); - - if (priority < otherPriority) { - return -1; - } - else if (priority > otherPriority) { - return 1; - } - } - - int classCompare = getClass().getName().compareTo(other.getClass().getName()); - - if (classCompare != 0) { - return classCompare; - } - - int hash = System.identityHashCode(this); - int otherHash = System.identityHashCode(other); - - if (hash < otherHash) - return -1; - else if (hash > otherHash) - return 1; - - return 0; - } - - /** - * @see TileOverlayPainter#dispose() - */ - @Override - public void dispose() { - executor.shutdownNow(); - - clearAll(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/BasicMapKit.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/BasicMapKit.java deleted file mode 100644 index 66a0f46ae4..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/BasicMapKit.java +++ /dev/null @@ -1,662 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer; - -import java.awt.Cursor; -import java.awt.Point; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.geom.Rectangle2D; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.mapviewer.DefaultTileCache; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.JXMapKit; -import org.jdesktop.swingx.mapviewer.JXMapViewer; -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; -import org.jdesktop.swingx.painter.CompoundPainter; -import org.jdesktop.swingx.painter.Painter; -import org.springframework.util.ClassUtils; - -import de.fhg.igd.mapviewer.concurrency.Concurrency; -import de.fhg.igd.mapviewer.concurrency.IJob; -import de.fhg.igd.mapviewer.concurrency.Job; -import de.fhg.igd.mapviewer.concurrency.Progress; -import de.fhg.igd.mapviewer.concurrency.SwingCallback; -import de.fhg.igd.mapviewer.server.MapServer; - -/** - * Basic MapKit - * - * @author Simon Templer - */ -public class BasicMapKit extends JXMapKit { - - private static final Log log = LogFactory.getLog(BasicMapKit.class); - - private static final long serialVersionUID = -708805464636342709L; - - /** - * The painter for the current map tool - */ - private final MapToolPainter toolPainter; - - /** - * The current map server - */ - private MapServer server; - - private TileCache cache; - - /** - * Defines whether this is synced with the 3D camera - */ - private boolean synced; - - /** - * The painter for all overlays - */ - private final CompoundPainter painter; - - /** - * The custom painters - */ - private final CompoundPainter customPainter; - - /** - * The painters associated directly with the map - * - * @see MapServer#getMapOverlay() - */ - private final CompoundPainter mapPainter; - - private List customPainters = new ArrayList(); - - private Lock customPaintersLock = new ReentrantLock(); - - /** - * Creates a basic map kit - */ - public BasicMapKit() { - this(new DefaultTileCache()); - } - - /** - * Creates a basic map kit - * - * @param cache the tile cache to use - */ - public BasicMapKit(TileCache cache) { - super(); - - this.cache = cache; - - getMiniMap().setPanEnabled(false); - getMiniMap().setCursor(Cursor.getDefaultCursor()); - - getZoomSlider().setCursor(Cursor.getDefaultCursor()); - getZoomInButton().setCursor(Cursor.getDefaultCursor()); - getZoomOutButton().setCursor(Cursor.getDefaultCursor()); - - getMiniMap().addMouseListener(new MouseAdapter() { - - /** - * @see MouseAdapter#mouseClicked(MouseEvent) - */ - @Override - public void mouseClicked(MouseEvent me) { - getMainMap() - .setCenterPosition(getMiniMap().convertPointToGeoPosition(me.getPoint())); - } - - }); - - // create painter for map tools - toolPainter = new MapToolPainter(getMainMap()); - - customPainter = new CompoundPainter(); - customPainter.setCacheable(false); - - mapPainter = new CompoundPainter(); - mapPainter.setCacheable(false); - - painter = new CompoundPainter(); - painter.setPainters(customPainter, toolPainter, mapPainter); - painter.setCacheable(false); - - updatePainters(); - - // register as state provider - // GuiState.getInstance().registerStateProvider(this); - } - - /** - * Update the custom painters - */ - private void updatePainters() { - customPaintersLock.lock(); - try { - for (MapPainter painter : customPainters) { - painter.setMapKit(this); - } - - MapPainter[] painters = new MapPainter[customPainters.size()]; - customPainters.toArray(painters); - customPainter.setPainters(painters); - } finally { - customPaintersLock.unlock(); - } - } - - /** - * Get all custom painters of a given type - * - * @param type the painter type - * @param the painter type - * @return the list of custom painters (not backed by the map kit) - */ - @SuppressWarnings("unchecked") - public List getCustomPainters(Class type) { - List results = new ArrayList(); - - customPaintersLock.lock(); - try { - for (MapPainter painter : customPainters) { - if (ClassUtils.isAssignable(type, painter.getClass())) { - results.add((T) painter); - } - } - } finally { - customPaintersLock.unlock(); - } - - return results; - } - - /** - * @return the list of custom painters (not backed by the map kit) - */ - public List getCustomPainters() { - List results; - - customPaintersLock.lock(); - try { - results = new ArrayList(customPainters); - } finally { - customPaintersLock.unlock(); - } - - return results; - } - - /** - * Sets the custom painters - * - * @param customPainters the custom painters - */ - public void setCustomPainters(List customPainters) { - customPaintersLock.lock(); - try { - this.customPainters = new ArrayList(customPainters); - } finally { - customPaintersLock.unlock(); - } - - updatePainters(); - } - - /** - * Adds a custom map painter - * - * @param painter the map painter - */ - public void addCustomPainter(MapPainter painter) { - synchronized (customPainters) { - customPainters.add(painter); - } - - updatePainters(); - } - - /** - * Removes a custom map painter - * - * @param painter the map painter - */ - public void removeCustomPainter(MapPainter painter) { - synchronized (customPainters) { - customPainters.remove(painter); - } - - updatePainters(); - } - - /** - * Get all tile overlay painters of a certain type - * - * @param the painter type - * @param type the painter type - * @return the list of tile overlay painters - */ - @SuppressWarnings("unchecked") - public List getTilePainters(Class type) { - List results = new ArrayList(); - - for (TileOverlayPainter painter : getMainMap().getTileOverlays()) { - if (ClassUtils.isAssignable(type, painter.getClass())) { - results.add((T) painter); - } - } - - return results; - } - - /** - * Creates all map painters save the tool painter - * - * @param mapViewer the main map viewer - * - * @return a list of painters - */ - protected List> createPainters(JXMapViewer mapViewer) { - return new ArrayList>(); - } - - /** - * Set the current map tool - * - * @param tool the {@link MapTool} to use - */ - public void setMapTool(MapTool tool) { - if (toolPainter.getMapTool() != null) - toolPainter.getMapTool().setActive(false); - toolPainter.setMapTool(tool); - tool.setActive(true); - getMainMap().setPanEnabled(tool.isPanEnabled()); - getMainMap().setCursor(tool.getCursor()); - getMainMap().repaint(); - } - - /** - * Get the current map tool - * - * @return the current map tool - */ - public MapTool getMapTool() { - return toolPainter.getMapTool(); - } - - /** - * Set the map kit's map server - * - * @param server the map server - * @param skipZoom if zooming to the area visible in the last map shall be - * skipped (makes sense when instead loading the state from file) - */ - public void setServer(final MapServer server, final boolean skipZoom) { - this.server = server; - - // remember map area - final Set gps = new HashSet(); - gps.add(getMainMap().convertPointToGeoPosition( - new Point((int) Math.round(getMainMap().getWidth() * 0.1), - (int) Math.round(getMainMap().getHeight() * 0.1)))); - gps.add(getMainMap().convertPointToGeoPosition( - new Point((int) Math.round(getMainMap().getWidth() * 0.9), - (int) Math.round(getMainMap().getHeight() * 0.9)))); - - onChangingServer(server); - - IJob job = new Job(Messages.BasicMapKit_0, new SwingCallback() { - - @Override - protected void finished(Void result) { - // dispose old map overlay - Painter[] oldOverlays = mapPainter.getPainters(); - if (oldOverlays != null) { - for (Painter oldOverlay : oldOverlays) { - if (oldOverlay instanceof MapPainter) { - ((MapPainter) oldOverlay).dispose(); - } - } - } - - // set the new map overlay - MapPainter mapOverlay = server.getMapOverlay(); - if (mapOverlay != null) { - mapPainter.setPainters(mapOverlay); - mapOverlay.setMapKit(BasicMapKit.this); - } - else { - mapPainter.setPainters(); - } - getMainMap().setOverlayPainter(painter); - - if (!skipZoom) { - // done in the step below - setCenterPosition(pos); - zoomToPositions(gps); - } - - revalidate(); - } - - @Override - protected void error(Throwable e) { - log.error("Error configuring map", e); //$NON-NLS-1$ - } - - }) { - - @Override - public Void work(Progress progress) throws Exception { - // configure the map kit - BasicMapKit.this.setTileFactory(server.getTileFactory(cache)); - - return null; - } - - }; - Concurrency.startJob(job); - } - - /** - * Set the tile cache - * - * @param cache the tile cache to use - */ - public void setTileCache(TileCache cache) { - this.cache = cache; - - // re-set current map - MapServer server = getServer(); - setServer(server, false); - } - - /** - * Called just before the current map server is set to the given server - * - * @param server the new map server - */ - protected void onChangingServer(MapServer server) { - // override me - } - - /** - * @see JXMapKit#setZoom(int) - */ - @Override - public void setZoom(int zoom) { - zoom = Math.min(zoom, getMainMap().getTileFactory().getTileProvider().getMaximumZoom()); - super.setZoom(zoom); - - if (zoom + 4 > getMainMap().getTileFactory().getTileProvider().getMaximumZoom()) - setMiniMapVisible(false); - else - setMiniMapVisible(true); - } - - /** - * Refresh the map - */ - public void refresh() { - getMainMap().repaint(); - } - - /** - * Zoom in and center on the given {@link GeoPosition} - * - * @param pos the {@link GeoPosition} - */ - public void zoomInToPosition(GeoPosition pos) { - setZoom(getMainMap().getTileFactory().getTileProvider().getMinimumZoom()); - setCenterPosition(pos); - } - - private static Set equalizeEpsg(Collection positions) { - if (positions.isEmpty()) - return new HashSet(positions); - - int epsg = -1; - - Set result = new HashSet(); - - for (GeoPosition pos : positions) { - if (epsg == -1) { - epsg = pos.getEpsgCode(); - result.add(pos); - } - else if (epsg != pos.getEpsgCode()) { - GeoPosition altPos; - try { - altPos = GeotoolsConverter.getInstance().convert(pos, epsg); - result.add(altPos); - } catch (IllegalGeoPositionException e) { - log.warn("Error converting GeoPosition, ignoring this position"); //$NON-NLS-1$ - } - } - else { - result.add(pos); - } - } - - return result; - } - - /** - * Center on the given {@link GeoPosition}s - * - * @param positions the {@link GeoPosition}s - */ - public void centerOnPositions(Set positions) { - if (positions.size() == 0) - return; - - positions = equalizeEpsg(positions); - - double minX = 0, maxX = 0, minY = 0, maxY = 0; - - boolean init = false; - int epsg = positions.iterator().next().getEpsgCode(); - - for (GeoPosition pos : positions) { - if (!init) { - // first pos - minY = maxY = pos.getY(); - minX = maxX = pos.getX(); - - init = true; - } - else { - if (pos.getY() < minY) - minY = pos.getY(); - else if (pos.getY() > maxY) - maxY = pos.getY(); - - if (pos.getX() < minX) - minX = pos.getX(); - else if (pos.getX() > maxX) - maxX = pos.getX(); - } - } - - setCenterPosition(new GeoPosition((minX + maxX) / 2.0, (minY + maxY) / 2.0, epsg)); - } - - private Rectangle2D generateBoundingRect(double minX, double minY, double maxX, double maxY, - int epsg, int zoom) throws IllegalGeoPositionException { - java.awt.geom.Point2D p1 = getMainMap().getTileFactory().getTileProvider().getConverter() - .geoToPixel(new GeoPosition(minX, minY, epsg), zoom); - java.awt.geom.Point2D p2 = getMainMap().getTileFactory().getTileProvider().getConverter() - .geoToPixel(new GeoPosition(maxX, maxY, epsg), zoom); - - return new Rectangle2D.Double((p1.getX() < p2.getX()) ? (p1.getX()) : (p2.getX()), - (p1.getY() < p2.getY()) ? (p1.getY()) : (p2.getY()), - Math.abs(p2.getX() - p1.getX()), Math.abs(p2.getY() - p1.getY())); - } - - /** - * Zoom in and center on the given {@link GeoPosition}s - * - * @param positions the {@link GeoPosition}s - */ - public void zoomToPositions(Set positions) { - if (positions.size() == 0) - return; - - positions = equalizeEpsg(positions); - int epsg = positions.iterator().next().getEpsgCode(); - - double minX = 0, maxX = 0, minY = 0, maxY = 0; - - boolean init = false; - - for (GeoPosition pos : positions) { - if (!init) { - // first pos - minY = maxY = pos.getY(); - minX = maxX = pos.getX(); - - init = true; - } - else { - if (pos.getY() < minY) - minY = pos.getY(); - else if (pos.getY() > maxY) - maxY = pos.getY(); - - if (pos.getX() < minX) - minX = pos.getX(); - else if (pos.getX() > maxX) - maxX = pos.getX(); - } - } - - // center on positions - setCenterPosition(new GeoPosition((minX + maxX) / 2.0, (minY + maxY) / 2.0, epsg)); - - // initial zoom - int zoom = getMainMap().getTileFactory().getTileProvider().getMinimumZoom(); - - try { - if (positions.size() >= 2) { - int viewWidth = (int) getMainMap().getViewportBounds().getWidth(); - int viewHeight = (int) getMainMap().getViewportBounds().getHeight(); - - Rectangle2D rect = generateBoundingRect(minX, minY, maxX, maxY, epsg, zoom); - - while ((viewWidth < rect.getWidth() || viewHeight < rect.getHeight()) - && zoom < getMainMap().getTileFactory().getTileProvider() - .getMaximumZoom()) { - zoom++; - rect = generateBoundingRect(minX, minY, maxX, maxY, epsg, zoom); - } - } - - setZoom(zoom); - } catch (IllegalGeoPositionException e) { - log.warn("Error zooming to positions");// , e); //$NON-NLS-1$ - } - } - - /** - * @return the server - */ - public MapServer getServer() { - return server; - } - - /** - * @param synced true if synced with the 3D map camera, false otherwise - */ - public void setSynced(boolean synced) { - this.synced = synced; - } - - /** - * @return true if synced with the 3D map camera, false otherwise - */ - public boolean isSynced() { - return this.synced; - } - - /* - * protected void loadState(GuiState state) { int oldEpsg = - * state.getInteger(BasicMapKit.class, LAST_EPSG, DEF_EPSG); - * - * GeoPosition p1 = new GeoPosition(state.getDouble(BasicMapKit.class, - * SHOW_MIN_X, DEF_MIN_X), state.getDouble(BasicMapKit.class, SHOW_MIN_Y, - * DEF_MIN_Y), oldEpsg); GeoPosition p2 = new - * GeoPosition(state.getDouble(BasicMapKit.class, SHOW_MAX_X, DEF_MAX_X), - * state.getDouble(BasicMapKit.class, SHOW_MAX_Y, DEF_MAX_Y), oldEpsg); - * - * Set positions = new HashSet(); - * positions.add(p1); positions.add(p2); zoomToPositions(positions); } - */ - - /* - * (non-Javadoc) - * - * @see - * de.fhg.igd.mutable.gui.StateProvider#onStateSave(de.fhg.igd.mutable.gui. - * GuiState) - */ - /* - * @Override public void onStateSave(GuiState state) { GeoPosition min = - * getMainMap().convertPointToGeoPosition(new Point((int) - * Math.round(getMainMap().getWidth() * 0.1), (int) - * Math.round(getMainMap().getHeight() * 0.1))); GeoPosition max = - * getMainMap().convertPointToGeoPosition(new Point((int) - * Math.round(getMainMap().getWidth() * 0.9), (int) - * Math.round(getMainMap().getHeight() * 0.9))); - * - * //GeoPosition min = getMainMap().convertPointToGeoPosition(new Point(0, - * 0)); //GeoPosition max = getMainMap().convertPointToGeoPosition(new - * Point(getMainMap().getWidth(), getMainMap().getHeight())); - * - * int epsg = min.getEpsgCode(); - * - * try { if (epsg != max.getEpsgCode()) max = - * EpsgGeoConverter.INSTANCE.convert(max, epsg); - * - * state.setDouble(BasicMapKit.class, SHOW_MIN_Y, min.getY()); - * state.setDouble(BasicMapKit.class, SHOW_MIN_X, min.getX()); - * state.setDouble(BasicMapKit.class, SHOW_MAX_Y, max.getY()); - * state.setDouble(BasicMapKit.class, SHOW_MAX_X, max.getX()); - * - * state.setInteger(BasicMapKit.class, LAST_EPSG, epsg); } catch - * (IllegalGeoPositionException e) { log.error( - * "Error saving map state: Could not convert GeoPosition", e); } } - */ - - /* - * @Override public void guiClosing() { // do nothing } - */ - - /* - * @Override public void guiStarted() { loadState(GuiState.getInstance()); } - */ - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapKitTileOverlayPainter.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapKitTileOverlayPainter.java deleted file mode 100644 index 87ca1246b1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapKitTileOverlayPainter.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer; - -import java.awt.Rectangle; - -/** - * Abstract overlay painter that knows of its {@link BasicMapKit} - * - * @author Simon Templer - */ -public abstract class MapKitTileOverlayPainter extends AbstractTileOverlayPainter { - - private BasicMapKit mapKit; - - /** - * @see AbstractTileOverlayPainter#AbstractTileOverlayPainter(int) - */ - public MapKitTileOverlayPainter(int numberOfThreads) { - super(numberOfThreads); - } - - /** - * Set the map kit - * - * @param mapKit the map kit - */ - public void setMapKit(BasicMapKit mapKit) { - this.mapKit = mapKit; - } - - /** - * Get the map kit - * - * @return the map kit - */ - public BasicMapKit getMapKit() { - return mapKit; - } - - /** - * @see AbstractTileOverlayPainter#isCurrentZoom(int) - */ - @Override - protected boolean isCurrentZoom(int zoom) { - if (mapKit != null) { - return zoom == mapKit.getMainMap().getZoom(); - } - - return false; - } - - @Override - protected Rectangle getCurrentViewBounds(int zoom) { - if (mapKit != null) { - if (mapKit.getMainMap().getZoom() == zoom) { - return mapKit.getMainMap().getViewportBounds(); - } - } - - return null; - } - - /** - * @see AbstractTileOverlayPainter#repaint() - */ - @Override - protected void repaint() { - if (mapKit != null) { - mapKit.refresh(); - } - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapPainter.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapPainter.java deleted file mode 100644 index 5afacfbd7f..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapPainter.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer; - -import java.awt.Point; - -import org.jdesktop.swingx.mapviewer.JXMapViewer; -import org.jdesktop.swingx.painter.Painter; - -/** - * Map painter interface. - * - * @author Simon Templer - */ -public interface MapPainter extends Painter { - - /** - * Sets the map kit that provides the context of the painter - * - * @param mapKit the map kit - */ - public void setMapKit(BasicMapKit mapKit); - - /** - * @param point the point of interest (usually the cursor position) - * @return the text string. Can be null or empty - */ - public String getTipText(Point point); - - /** - * Perform clean-up - */ - public void dispose(); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapTool.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapTool.java deleted file mode 100644 index d3add2cde2..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapTool.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer; - -import java.awt.Cursor; -import java.awt.event.MouseEvent; -import java.net.URL; -import java.util.List; - -import org.jdesktop.swingx.mapviewer.GeoPosition; - -/** - * MapTool - * - * @author Simon Templer - * - * @version $Id$ - */ -public interface MapTool { - - /** - * Resets the tool - */ - public void reset(); - - /** - * Get the tool id - * - * @return the tool id - */ - public String getId(); - - /** - * Get the tool name - * - * @return the tool name - */ - public String getName(); - - /** - * Get the tool description - * - * @return the tool description - */ - public String getDescription(); - - /** - * Get the icon URL - * - * @return the icon URL - */ - public URL getIconURL(); - - /** - * Get the tool cursor - * - * @return the tool cursor - */ - public Cursor getCursor(); - - /** - * Get the tool renderer - * - * @return the tool renderer - */ - public MapToolRenderer getRenderer(); - - /** - * Get if panning shall be enabled for the tool - * - * @return if panning shall be enabled for the tool - */ - public boolean isPanEnabled(); - - /** - * Get the list of positions collected by the tool - * - * @return the list of positions - */ - public List getPositions(); - - /** - * Called when a mouse button has been pressed - * - * @param me the mouse event - * @param pos the corresponding geo position - */ - public void mousePressed(MouseEvent me, GeoPosition pos); - - /** - * Called when a mouse button has been released - * - * @param me the mouse event - * @param pos the corresponding geo position - */ - public void mouseReleased(MouseEvent me, GeoPosition pos); - - /** - * Called when a mouse button has been clicked - * - * @param me the mouse event - * @param pos the corresponding geo position - */ - public void mouseClicked(MouseEvent me, GeoPosition pos); - - /** - * Set if the tool is active - * - * @param active if the tool is active - */ - public void setActive(boolean active); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapToolActivator.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapToolActivator.java deleted file mode 100644 index 67957323d8..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapToolActivator.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer; - -import javax.swing.AbstractButton; - -import de.fhg.igd.mapviewer.tools.Activator; - -/** - * MapToolActivator - * - * @author Simon Templer - * - * @version $Id$ - */ -public class MapToolActivator implements Activator { - - private final AbstractButton button; - - /** - * Constructor - * - * @param button the internal button - */ - public MapToolActivator(AbstractButton button) { - super(); - - this.button = button; - } - - /** - * @see Activator#activate() - */ - @Override - public void activate() { - button.setSelected(true); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapToolPainter.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapToolPainter.java deleted file mode 100644 index 3c78db3f0f..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapToolPainter.java +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer; - -import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; -import java.awt.event.MouseMotionListener; -import java.awt.geom.Point2D; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.JXMapViewer; -import org.jdesktop.swingx.painter.AbstractPainter; - -/** - * MapToolPainter - * - * @author Simon Templer - * - * @version $Id$ - */ -public class MapToolPainter extends AbstractPainter - implements MapPainter, MouseListener, MouseMotionListener { - - private static final Log log = LogFactory.getLog(MapToolPainter.class); - - private MapTool mapTool; - - private Point2D mousePos = null; - - private final JXMapViewer mapViewer; - - /** - * Constructor - * - * @param mapViewer the map viewer - */ - public MapToolPainter(JXMapViewer mapViewer) { - mapViewer.addMouseListener(this); - mapViewer.addMouseMotionListener(this); - - this.mapViewer = mapViewer; - - setAntialiasing(true); - setCacheable(false); - } - - /** - * @see AbstractPainter#doPaint(Graphics2D, Object, int, int) - */ - @Override - protected void doPaint(Graphics2D g, JXMapViewer mapViewer, int width, int height) { - if (mapTool == null || mapTool.getRenderer() == null) { - return; - } - - // convert positions to pixels inside viewport - List points = new ArrayList(); - - try { - for (GeoPosition pos : mapTool.getPositions()) { - points.add(mapViewer.convertGeoPositionToPoint(pos)); - } - - // call renderer - mapTool.getRenderer().paint(g, points, mousePos, mapTool); - } catch (IllegalGeoPositionException e) { - log.error("Error converting tool positions", e); //$NON-NLS-1$ - } - } - - /** - * @return the mapTool - */ - public MapTool getMapTool() { - return mapTool; - } - - /** - * @param mapTool the mapTool to set - */ - public void setMapTool(MapTool mapTool) { - this.mapTool = mapTool; - } - - /** - * @see MouseMotionListener#mouseDragged(MouseEvent) - */ - @Override - public void mouseDragged(MouseEvent me) { - mouseMove(me); - } - - /** - * @see MouseMotionListener#mouseMoved(MouseEvent) - */ - @Override - public void mouseMoved(MouseEvent me) { - mouseMove(me); - } - - private void mouseMove(MouseEvent me) { - // save mouse position (viewport pixels) - mousePos = me.getPoint(); - // repaint if necessary - if (mapTool != null && mapTool.getRenderer() != null - && mapTool.getRenderer().repaintOnMouseMove()) - mapViewer.repaint(); - } - - /** - * @see MouseListener#mouseClicked(MouseEvent) - */ - @Override - public void mouseClicked(MouseEvent me) { - if (mapTool != null) { - mapTool.mouseClicked(me, mapViewer.convertPointToGeoPosition(me.getPoint())); - } - } - - /** - * @see MouseListener#mouseEntered(MouseEvent) - */ - @Override - public void mouseEntered(MouseEvent me) { - // ignore - } - - /** - * @see MouseListener#mouseExited(MouseEvent) - */ - @Override - public void mouseExited(MouseEvent me) { - // ignore - } - - /** - * @see MouseListener#mousePressed(MouseEvent) - */ - @Override - public void mousePressed(MouseEvent me) { - if (mapTool != null) { - mapTool.mousePressed(me, mapViewer.convertPointToGeoPosition(me.getPoint())); - } - } - - /** - * @see MouseListener#mouseReleased(MouseEvent) - */ - @Override - public void mouseReleased(MouseEvent me) { - if (mapTool != null) { - mapTool.mouseReleased(me, mapViewer.convertPointToGeoPosition(me.getPoint())); - - // reset cursor - mapViewer.setCursor(mapTool.getCursor()); - } - } - - /** - * @see MapPainter#setMapKit(BasicMapKit) - */ - @Override - public void setMapKit(BasicMapKit mapKit) { - // ignore - } - - @Override - public String getTipText(Point point) { - return null; - } - - /** - * @see MapPainter#dispose() - */ - @Override - public void dispose() { - mapViewer.removeMouseListener(this); - mapViewer.removeMouseMotionListener(this); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapToolRenderer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapToolRenderer.java deleted file mode 100644 index b7540d5524..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/MapToolRenderer.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer; - -import java.awt.Graphics2D; -import java.awt.geom.Point2D; -import java.util.List; - -/** - * MapToolRenderer - * - * @author Simon Templer - * - * @version $Id$ - */ -public interface MapToolRenderer { - - /** - * Paints the tool - * - * @param g the graphics device - * @param points the list of collected points - * @param mousePos the current mouse position - * @param tool the map tool - */ - public void paint(final Graphics2D g, final List points, final Point2D mousePos, - final MapTool tool); - - /** - * Determines if the tool has to be repainted on mouse move - * - * @return if the tool has to be repainted on mouse move - */ - public boolean repaintOnMouseMove(); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/Messages.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/Messages.java deleted file mode 100644 index be0c0e99f3..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/Messages.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer; - -import org.eclipse.osgi.util.NLS; - -/** - * Mapviewer messages - * - * @author Simon Templer - */ -@SuppressWarnings("all") -public class Messages extends NLS { - - private static final String BUNDLE_NAME = "de.fhg.igd.mapviewer.messages"; //$NON-NLS-1$ - - public static String BasicMapKit_0; - - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/NoopRefresher.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/NoopRefresher.java deleted file mode 100644 index e38b585609..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/NoopRefresher.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer; - -import java.awt.image.BufferedImageOp; - -import org.jdesktop.swingx.mapviewer.GeoPosition; - -/** - * A refresher that does simply nothing - * - * @author Michel Kraemer - */ -public class NoopRefresher implements Refresher { - - /** - * A singleton instance of this stateless refresher - */ - public static final NoopRefresher INSTANCE = new NoopRefresher(); - - private NoopRefresher() { - // nothing to do here - } - - @Override - public void setImageOp(BufferedImageOp imageOp) { - // nothing to do here - } - - @Override - public void addPosition(GeoPosition pos) { - // nothing to do here - } - - @Override - public void addArea(GeoPosition topLeft, GeoPosition bottomRight) { - // nothing to do here - } - - @Override - public void execute() { - // nothing to do here - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/Refresher.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/Refresher.java deleted file mode 100644 index 01c4a95291..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/Refresher.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer; - -import java.awt.image.BufferedImageOp; - -import org.jdesktop.swingx.mapviewer.GeoPosition; - -/** - * Refreshes tiles that lie within added areas - * - * @author Simon Templer - * @author Michel Kraemer - */ -public interface Refresher { - - /** - * Set an image operation that is applied to an invalidated image that is - * only present until replaced by the newly drawn tile. - * - * @param imageOp the imageOp to set - */ - void setImageOp(BufferedImageOp imageOp); - - /** - * Add a position - * - * @param pos the position - */ - void addPosition(GeoPosition pos); - - /** - * Adds an area (a bounding box) - * - * @param topLeft the top left corner of the bounding box - * @param bottomRight the bottom right corner of the bounding box - */ - void addArea(GeoPosition topLeft, GeoPosition bottomRight); - - /** - * Execute the refresh - */ - void execute(); -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/cache/FileTileCache.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/cache/FileTileCache.java deleted file mode 100644 index 579e51e311..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/cache/FileTileCache.java +++ /dev/null @@ -1,198 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.cache; - -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - -import org.apache.commons.io.IOUtils; -import org.jdesktop.swingx.mapviewer.AbstractBufferedImageTileCache; -import org.jdesktop.swingx.mapviewer.TileInfo; - -import de.fhg.igd.slf4jplus.ALogger; -import de.fhg.igd.slf4jplus.ALoggerFactory; - -/** - * {@link SoftTileCache} that additionally stores remote images on the local - * file system - * - * @author Simon Templer - */ -public class FileTileCache extends SoftTileCache { - - private static final ALogger log = ALoggerFactory.getLogger(FileTileCache.class); - - private final File cacheDir; - - /** - * Constructor - * - * @param cacheDir the cache directory - */ - public FileTileCache(File cacheDir) { - super(); - this.cacheDir = cacheDir; - - log.info("Create file tile cache with cache directory " + cacheDir.getAbsolutePath()); //$NON-NLS-1$ - } - - /** - * @see SoftTileCache#doGet(TileInfo) - */ - @Override - protected BufferedImage doGet(TileInfo tile) { - BufferedImage img = super.doGet(tile); - - if (img == null && useFileCacheFor(tile.getIdentifier())) { - // try loading the image from local file cache - File file = getLocalFile(tile); - if (file.exists()) { - try { - img = load(tile, new FileInputStream(file)); - } catch (FileNotFoundException e) { - // ignore - } /* - * catch (IOException e) { log.error( - * "Error loading local cache file: " + - * file.getAbsolutePath(), e); //$NON-NLS-1$ } - */ - } - } - - return img; - } - - /** - * @see AbstractBufferedImageTileCache#load(TileInfo) - */ - @Override - protected BufferedImage load(TileInfo tile) { - try { - return load(tile, true); - } catch (Exception e) { - log.error("Error loading tile", e); - return null; - } - } - - private BufferedImage load(TileInfo tile, boolean cache) throws IOException { - InputStream in = null; - if (cache && useFileCacheFor(tile.getIdentifier())) { - // copy to local file, load from there - File local = getLocalFile(tile); - if (local != null) { - // copy stream - local.getParentFile().mkdirs(); - local.createNewFile(); - - InputStream remote = openInputStream(tile.getURI()); - FileOutputStream out = new FileOutputStream(local); - try { - IOUtils.copy(remote, out); - } finally { - out.close(); - remote.close(); - } - - // use local file as new source - in = new FileInputStream(local); - } - } - - if (in == null) { - in = openInputStream(tile.getURI()); - } - - // super.load closes in - return super.load(tile, in); - } - - /** - * Get the local cache file name for the given URI - * - * @param tile the tile info - * - * @return the local file or null - */ - protected File getLocalFile(TileInfo tile) { - URI uri = tile.getIdentifier(); - File dir = new File(cacheDir, uri.getHost()); - dir = new File(dir, "level-" + tile.getZoom()); //$NON-NLS-1$ - try { - String mapKey = computeHash(uri.toString()); - return new File(dir, tile.getX() + "_" + tile.getY() + "_" + mapKey); //$NON-NLS-1$ //$NON-NLS-2$ - } catch (Throwable e) { - log.error("Error determinating local file name for caching", e); //$NON-NLS-1$ - return null; - } - } - - /** - * Compute a secure hash for the given string - * - * @param password the string - * - * @return the hash of the string as HEX string - * @throws NoSuchAlgorithmException if the SHA-1 algorithm could not be - * found - */ - protected String computeHash(String password) throws NoSuchAlgorithmException { - MessageDigest digest = MessageDigest.getInstance("SHA-1"); - digest.reset(); - digest.update(password.getBytes()); - return byteArrayToHexString(digest.digest()); - } - - /** - * Convert a byte array to a HEX string - * - * @param bytes the byte array - * - * @return the bytes as HEX string - */ - private String byteArrayToHexString(byte[] bytes) { - StringBuilder sb = new StringBuilder(bytes.length * 2); - for (int i = 0; i < bytes.length; i++) { - int v = bytes[i] & 0xff; - if (v < 16) { - sb.append('0'); - } - sb.append(Integer.toHexString(v)); - } - return sb.toString().toUpperCase(); - } - - /** - * Determines if for a given URI the local file cache shall be used - * - * @param uri the URI - * - * @return if the file cache shall be used - */ - protected boolean useFileCacheFor(URI uri) { - String scheme = uri.getScheme(); - return scheme.equalsIgnoreCase("http") || scheme.equalsIgnoreCase("https"); //$NON-NLS-1$ //$NON-NLS-2$ - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/cache/SoftTileCache.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/cache/SoftTileCache.java deleted file mode 100644 index ef62b4b8ab..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/cache/SoftTileCache.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.cache; - -import java.awt.image.BufferedImage; -import java.lang.ref.SoftReference; -import java.net.URI; -import java.util.HashMap; -import java.util.Map; - -import org.jdesktop.swingx.mapviewer.AbstractBufferedImageTileCache; -import org.jdesktop.swingx.mapviewer.TileInfo; - -/** - * Cache using soft references to images - * - * @author Simon Templer - */ -public class SoftTileCache extends AbstractBufferedImageTileCache { - - private final Map> images = new HashMap>(); - - /** - * @see AbstractBufferedImageTileCache#doPut(TileInfo, BufferedImage) - */ - @Override - protected void doPut(TileInfo tile, BufferedImage image) { - synchronized (images) { - images.put(tile.getIdentifier(), new SoftReference(image)); - } - } - - /** - * @see AbstractBufferedImageTileCache#doGet(TileInfo) - */ - @Override - protected BufferedImage doGet(TileInfo tile) { - SoftReference ref; - synchronized (images) { - ref = images.get(tile.getIdentifier()); - } - - if (ref != null) { - return ref.get(); - } - - return null; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/AbstractContinuousJob.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/AbstractContinuousJob.java deleted file mode 100644 index 6191e0f70e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/AbstractContinuousJob.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.concurrency; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -/** - * Job that allows handling partial results - * - * @param the partial result type - * @author Simon Templer - */ -public abstract class AbstractContinuousJob extends Job { - - private boolean completed = false; - - private List results = new ArrayList(); - - private final Lock resultsLock = new ReentrantLock(); - - private List processing = new ArrayList(); - - private final Lock processingLock = new ReentrantLock(); - - private ProcessingStrategy strategy = new DefaultProcessingStrategy(10, 100); - - /** - * Constructor - * - * @param name the job name - */ - public AbstractContinuousJob(String name) { - super(name); - } - - /** - * @see Job#work(Progress) - */ - @Override - final public Void work(Progress progress) throws Exception { - try { - doWork(progress); - } catch (Throwable e) { - error(e); - } finally { - completed = true; - trigger(); - } - return null; - } - - /** - * Called when an error occurred while executing {@link #doWork(Progress)} - * - * @param e the error - */ - protected abstract void error(Throwable e); - - /** - * Gets the work done, publish partial results using the - * {@link #publish(Object)} method. - * - * @param progress the job progress - * @throws Exception if an error occurs - */ - protected abstract void doWork(Progress progress) throws Exception; - - /** - * Publish an object for processing - * - * @param object the object to publish - */ - protected void publish(T object) { - resultsLock.lock(); - try { - results.add(object); - } finally { - resultsLock.unlock(); - } - - trigger(); - } - - /** - * Trigger processing - */ - protected void trigger() { - if (processingLock.tryLock()) { - if (processing.isEmpty()) { - // last processing is finished - - resultsLock.lock(); - try { - boolean allowed = strategy.allowProcess(results.size()); - - if (allowed || completed) { // check if processing is - // allowed - List temp = processing; - processing = results; - results = temp; - resultsLock.unlock(); - - if (!processing.isEmpty()) { - // process collected results - Thread thread = new Thread(new Runnable() { - - @Override - public void run() { - processingLock.lock(); - try { - process(new ArrayList(processing)); - } finally { - processing.clear(); - processingLock.unlock(); - trigger(); - } - } - - }); - thread.start(); - } - } - else { - resultsLock.unlock(); - } - } catch (Throwable e) { - resultsLock.unlock(); - } - } - - processingLock.unlock(); - } - } - - /** - * Process the results - * - * @param currentResults the list of current partial results - */ - protected abstract void process(List currentResults); - - /** - * @param strategy the strategy to set - */ - public void setStrategy(ProcessingStrategy strategy) { - this.strategy = strategy; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Callback.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Callback.java deleted file mode 100644 index 860d9d636c..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Callback.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.concurrency; - -/** - * Job call-back - * - * @author Simon Templer - * - * @version $Id$ - * - * @param the job result type - */ -public interface Callback { - - /** - * Called then job is done - * - * @param result the job result - */ - public void done(R result); - - /** - * Called when the job failed - * - * @param e the error - */ - public void failed(Throwable e); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Concurrency.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Concurrency.java deleted file mode 100644 index 04d9670126..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Concurrency.java +++ /dev/null @@ -1,325 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.concurrency; - -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; - -import de.fhg.igd.osgi.util.SingleServiceTracker; -import de.fhg.igd.slf4jplus.ALogger; -import de.fhg.igd.slf4jplus.ALoggerFactory; -import de.fhg.igd.slf4jplus.ATransaction; - -/** - * Helper for running concurrent jobs based on an {@link Executor} available as - * OSGi service. - * - * @author Simon Templer - */ -public class Concurrency extends SingleServiceTrackerimplements Executor { - - private static final ALogger log = ALoggerFactory.getLogger(Concurrency.class); - - /** - * Job wrapper. Begins and ends log transactions if necessary - * - * @param the job result type - */ - private static class JobWrapper implements IJob { - - private final IJob job; - - private CallbackWrapper callbackWrapper; - - /** - * @param job the internal job - */ - public JobWrapper(IJob job) { - super(); - - this.job = job; - } - - /** - * Set a call-back wrapper - * - * @param callbackWrapper the call-back wrapper to set - */ - public void setCallbackWrapper(CallbackWrapper callbackWrapper) { - this.callbackWrapper = callbackWrapper; - - if (callbackWrapper != null) { - callbackWrapper.setCallback(job.getCallback()); - } - } - - /** - * @see IJob#getCallback() - */ - @Override - public Callback getCallback() { - if (callbackWrapper != null) { - return callbackWrapper; - } - else { - return job.getCallback(); - } - } - - /** - * @see IJob#getName() - */ - @Override - public String getName() { - return job.getName(); - } - - /** - * @see IJob#isBackground() - */ - @Override - public boolean isBackground() { - return job.isBackground(); - } - - /** - * @see IJob#isHidden() - */ - @Override - public boolean isHidden() { - return job.isHidden(); - } - - /** - * @see IJob#isLogTransaction() - */ - @Override - public boolean isLogTransaction() { - return job.isLogTransaction(); - } - - /** - * @see IJob#isModal() - */ - @Override - public boolean isModal() { - return job.isModal(); - } - - /** - * @see IJob#isExclusive() - */ - @Override - public boolean isExclusive() { - return job.isExclusive(); - } - - /** - * @see IJob#work(Progress) - */ - @Override - public T work(Progress progress) throws Exception { - ATransaction logTrans; - if (job.isLogTransaction()) { - logTrans = log.begin(getName()); - } - else { - logTrans = null; - } - try { - return job.work(progress); - } finally { - if (logTrans != null) { - logTrans.end(); - } - } - } - - } - - /** - * Wrapper for call-backs that provides the means of getting notified on job - * completion - * - * @param the job result type - */ - private static abstract class CallbackWrapper implements Callback { - - /** - * The inner call-back - */ - private Callback callback; - - /** - * @param callback the call-back to set - */ - public void setCallback(Callback callback) { - this.callback = callback; - } - - /** - * @see Callback#done(java.lang.Object) - */ - @Override - public void done(T result) { - try { - if (callback != null) { - callback.done(result); - } - } finally { - finished(true, result, null); - } - } - - /** - * Called when the job has been execution has been finished - * - * @param success if the job completed successfully - * @param result the job result if any - * @param error the error while executing the job if it was not - * successful - */ - protected abstract void finished(boolean success, T result, Throwable error); - - /** - * @see Callback#failed(Throwable) - */ - @Override - public void failed(Throwable e) { - try { - if (callback != null) { - callback.failed(e); - } - } finally { - finished(false, null, e); - } - } - - } - - private static final Concurrency instance = new Concurrency(); - - /** - * Get the job executor - * - * @return the job executor - */ - public static Executor getExecutor() { - return instance; - } - - /** - * Get the concurrency instance - * - * @return the concurrency instance - */ - public static Concurrency getInstance() { - return instance; - } - - /** - * Start/schedule a job if possible - * - * @param the job result type - * @param job the job - * @throws NullPointerException if there is no {@link Executor} service - * available - */ - public static void startJob(IJob job) { - instance.start(new JobWrapper(job)); - } - - /** - * Execute a job and wait for the result - * - * @param the job result type - * @param job the job - * @return the job result - * @throws ExecutionException if executing the job fails - * @throws NullPointerException if there is no {@link Executor} service - * available - */ - public static T startAndWait(IJob job) throws ExecutionException { - final AtomicBoolean finished = new AtomicBoolean(false); - - final AtomicBoolean aSuccess = new AtomicBoolean(); - final AtomicReference aResult = new AtomicReference(); - final AtomicReference aError = new AtomicReference(); - - final Thread current = Thread.currentThread(); - - JobWrapper exec = new JobWrapper(job); - exec.setCallbackWrapper(new CallbackWrapper() { - - @Override - protected void finished(boolean success, T result, Throwable error) { - // set as finished - finished.set(true); - - // set results - aSuccess.set(success); - aResult.set(result); - aError.set(error); - - // notify thread - synchronized (current) { - current.notify(); - } - } - - }); - - instance.start(exec); - - synchronized (current) { - while (!finished.get()) { - try { - current.wait(); - } catch (InterruptedException e) { - // ignore - } - } - } - - if (aSuccess.get()) { - return aResult.get(); - } - else { - throw new ExecutionException("Error executing job: " + job.getName(), aError.get()); - } - } - - /** - * Creates a {@link Concurrency} instance - */ - protected Concurrency() { - super(Executor.class); - } - - /** - * @see Executor#start(IJob) - */ - @Override - public void start(IJob job) { - Executor exec = getService(); - if (exec != null) { - exec.start(job); - } - // TODO queue jobs for later execution if there is no service? - else - throw new NullPointerException("No executor service available"); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/ContinuousJob.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/ContinuousJob.java deleted file mode 100644 index d6f86dcf27..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/ContinuousJob.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.concurrency; - -import java.util.List; - -/** - * Job that allows handling partial results using a {@link Callback} - * - * @param the partial result type - * @author Simon Templer - */ -public abstract class ContinuousJob extends AbstractContinuousJob { - - private final Callback> callback; - - /** - * Constructor - * - * @param name the job name - * @param callback the call-back for partial results - */ - public ContinuousJob(String name, Callback> callback) { - super(name); - - this.callback = callback; - } - - /** - * @see AbstractContinuousJob#error(Throwable) - */ - @Override - protected void error(Throwable e) { - callback.failed(e); - } - - /** - * @see AbstractContinuousJob#process(List) - */ - @Override - protected void process(List currentResults) { - callback.done(currentResults); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/DefaultProcessingStrategy.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/DefaultProcessingStrategy.java deleted file mode 100644 index cf9bc1e795..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/DefaultProcessingStrategy.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.concurrency; - -/** - * Default processing strategy. - * - * @author Simon Templer - */ -public class DefaultProcessingStrategy implements ProcessingStrategy { - - private final int count; - - private final int interval; - - private long lastProcessing = 0; - - /** - * Constructor. Only one condition (count or interval) has to be true to - * allow processing - * - * @param count the minimum number of partial results that allows processing - * (values less than one will be ignored) - * @param interval the minimum time interval in milliseconds between - * processing (values less than zero will be ignored) - */ - public DefaultProcessingStrategy(int count, int interval) { - super(); - this.count = count; - this.interval = interval; - } - - /** - * @see ProcessingStrategy#allowProcess(int) - */ - @Override - public boolean allowProcess(int size) { - boolean allow = (count > 0 && size >= count) - || (interval >= 0 && System.currentTimeMillis() >= lastProcessing + interval); - - if (allow) { - lastProcessing = System.currentTimeMillis(); - } - - return allow; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/ExclusiveSchedulingRule.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/ExclusiveSchedulingRule.java deleted file mode 100644 index b97f13d2f6..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/ExclusiveSchedulingRule.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.concurrency; - -import org.eclipse.core.runtime.jobs.ISchedulingRule; - -/** - * Exclusive execution of jobs with equal name - * - * @author Simon Templer - */ -public class ExclusiveSchedulingRule implements ISchedulingRule { - - private String name; - - /** - * Constructor - * - * @param name the rule name - */ - public ExclusiveSchedulingRule(String name) { - super(); - this.name = name; - } - - /** - * @see ISchedulingRule#contains(ISchedulingRule) - */ - @Override - public boolean contains(ISchedulingRule rule) { - return false; - } - - /** - * @see ISchedulingRule#isConflicting(ISchedulingRule) - */ - @Override - public boolean isConflicting(ISchedulingRule rule) { - if (rule instanceof ExclusiveSchedulingRule) { - return ((ExclusiveSchedulingRule) rule).name.equals(name); - } - else { - return false; - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/ExecutionException.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/ExecutionException.java deleted file mode 100644 index fe37622f9a..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/ExecutionException.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.concurrency; - -/** - * Exception that is thrown when a {@link Job} execution fails, the cause is the - * exception that occurred while executing the job. - * - * @author Simon Templer - */ -public class ExecutionException extends Exception { - - private static final long serialVersionUID = -2763066424592691156L; - - /** - * @see Exception#Exception(String, Throwable) - */ - public ExecutionException(String message, Throwable cause) { - super(message, cause); - } - - /** - * @see Exception#Exception(Throwable) - */ - public ExecutionException(Throwable cause) { - super(cause); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Executor.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Executor.java deleted file mode 100644 index 0f617bb74e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Executor.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.concurrency; - -/** - * Executor interface. - * - * @author Simon Templer - */ -public interface Executor { - - /** - * StarExecutorob - * - * @param the job result type - * - * @param job the job - */ - public void start(IJob job); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/IJob.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/IJob.java deleted file mode 100644 index c8276f6eb4..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/IJob.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.concurrency; - -/** - * Job interface - * - * @author Simon Templer - * @param the result type - */ -public interface IJob { - - /** - * Get the call-back - * - * @return the call-back - */ - public abstract Callback getCallback(); - - /** - * Get the job name - * - * @return the job name - */ - public abstract String getName(); - - /** - * @return if the job is modal - */ - public abstract boolean isModal(); - - /** - * @return if this is a hidden job - */ - public abstract boolean isHidden(); - - /** - * @return if this is a background job - */ - public abstract boolean isBackground(); - - /** - * @return if the job execution shall be represented by a log transaction - */ - public abstract boolean isLogTransaction(); - - /** - * @return if the job execution shall be exclusive for jobs with the same - * name - */ - public abstract boolean isExclusive(); - - /** - * Gets the job done - * - * @param progress the job progress monitor - * - * @return the result (yes, I know you knew) - * @throws Exception if an error occurs - */ - public abstract R work(Progress progress) throws Exception; - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Job.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Job.java deleted file mode 100644 index ab589419de..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Job.java +++ /dev/null @@ -1,178 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.concurrency; - -/** - * Abstract {@link IJob} implementation. - * - * @author Simon Templer - * @param the job result type - */ -public abstract class Job implements IJob { - - private Callback callback; - - private final String name; - - private boolean background = true; - - private boolean hidden = false; - - private boolean modal = false; - - /** - * if the job execution shall be exclusive for jobs with the same name - */ - private boolean exclusive = false; - - /** - * if a log transaction shall be created for the job - */ - private boolean logTransaction = false; - - /** - * Creates a job - * - * @param name the job name - */ - public Job(String name) { - this(name, null); - } - - /** - * Creates a worker with the given call-back - * - * @param name the job name - * @param callback the call-back - */ - public Job(String name, Callback callback) { - super(); - - this.callback = callback; - this.name = name; - } - - /** - * @see IJob#getCallback() - */ - @Override - public Callback getCallback() { - return callback; - } - - /** - * Set the call-back - * - * @param callback the call-back to set - */ - public void setCallback(Callback callback) { - this.callback = callback; - } - - /** - * Set if the job execution shall be exclusive for jobs with the same name - * - * @param exclusive if the job execution shall be exclusive for jobs with - * the same name - */ - public void setExclusive(boolean exclusive) { - this.exclusive = exclusive; - } - - /** - * @see IJob#isExclusive() - */ - @Override - public boolean isExclusive() { - return exclusive; - } - - /** - * Set if a log transaction shall be created for the job - * - * @param logTransaction if a log transaction shall be created for the job - */ - public void setLogTransaction(boolean logTransaction) { - this.logTransaction = logTransaction; - } - - /** - * @see IJob#isLogTransaction() - */ - @Override - public boolean isLogTransaction() { - return logTransaction; - } - - /** - * @see IJob#getName() - */ - @Override - public String getName() { - return name; - } - - /** - * @see IJob#isModal() - */ - @Override - public boolean isModal() { - return modal; - } - - /** - * @param modal the modal to set - */ - public void setModal(boolean modal) { - this.modal = modal; - } - - /** - * @see IJob#isHidden() - */ - @Override - public boolean isHidden() { - return hidden; - } - - /** - * @param hidden the hidden to set - */ - public void setHidden(boolean hidden) { - this.hidden = hidden; - } - - /** - * @see IJob#isBackground() - */ - @Override - public boolean isBackground() { - return background; - } - - /** - * @param background the background to set - */ - public void setBackground(boolean background) { - this.background = background; - } - - /** - * @see IJob#work(Progress) - */ - @Override - public abstract R work(Progress progress) throws Exception; - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/JobExecutor.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/JobExecutor.java deleted file mode 100644 index 1ae059d134..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/JobExecutor.java +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.concurrency; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; - -/** - * Executor using Eclipse jobs. - * - * @author Simon Templer - */ -public class JobExecutor implements Executor { - - /** - * Eclipse Job Progress - */ - public static class JobProgress implements Progress { - - private final IProgressMonitor monitor; - - private final String name; - - /** - * Creates a job progress - * - * @param monitor the eclipse progress monitor - * @param name the job name - */ - public JobProgress(IProgressMonitor monitor, String name) { - this.monitor = monitor; - this.name = name; - } - - /** - * @see Progress#begin(int) - */ - @Override - public void begin(int total) { - monitor.beginTask(name, total); - } - - /** - * @see Progress#begin() - */ - @Override - public void begin() { - monitor.beginTask(name, IProgressMonitor.UNKNOWN); - } - - /** - * @see Progress#isCanceled() - */ - @Override - public boolean isCanceled() { - return monitor.isCanceled(); - } - - /** - * @see Progress#progress(int) - */ - @Override - public void progress(int work) { - monitor.worked(work); - } - - /** - * @see Progress#setTask(String) - */ - @Override - public void setTask(String task) { - monitor.setTaskName(task); - } - - } - - /** - * Custom job - * - * @param the job result type - */ - public static class CustomJob extends Job { - - private final IJob job; - - /** - * Creates a eclipse job wrapping a - * {@link de.fhg.igd.mapviewer.concurrency.Job} - * - * @param job the job to execute - */ - public CustomJob(IJob job) { - super(job.getName()); - - this.job = job; - - if (job.isHidden()) { - setSystem(true); - } - else if (!job.isBackground()) { - setUser(true); - } - - if (job.isExclusive()) { - setRule(new ExclusiveSchedulingRule(job.getName())); - } - } - - /** - * @see Job#run(IProgressMonitor) - */ - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - Progress progress = new JobProgress(monitor, job.getName()); - R result = job.work(progress); - if (job.getCallback() != null) { - job.getCallback().done(result); - } - monitor.done(); - return Status.OK_STATUS; - } catch (Throwable e) { - if (job.getCallback() != null) { - job.getCallback().failed(e); - } - return Status.CANCEL_STATUS; - } - } - - } - - /** - * @see Executor#start(IJob) - */ - @Override - public void start(IJob job) { - Job eclipseJob = new CustomJob(job); - eclipseJob.schedule(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/ProcessingStrategy.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/ProcessingStrategy.java deleted file mode 100644 index 178dd614d5..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/ProcessingStrategy.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.concurrency; - -/** - * Processing strategy interface. - * - * @author Simon Templer - */ -public interface ProcessingStrategy { - - /** - * Return if processing is allowed - * - * @param size the current number of partial results - * @return if processing shall be allowed - */ - public boolean allowProcess(int size); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Progress.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Progress.java deleted file mode 100644 index 65af4c74d9..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/Progress.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.concurrency; - -/** - * Progress interface. - * - * @author Simon Templer - */ -public interface Progress { - - /** - * Begin the job - * - * @param total the total number of work units - */ - public void begin(int total); - - /** - * Begin the job, the number of work units is indeterminate - */ - public void begin(); - - /** - * Inform about work progression - * - * @param work the number of work units that have just been done - */ - public void progress(int work); - - /** - * Set the name of the current task - * - * @param task the task name - */ - public void setTask(String task); - - /** - * Determines if the job was canceled, long running jobs should check this - * method and cancel processing. - * - * @return if the job was canceled - */ - public boolean isCanceled(); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/SwingCallback.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/SwingCallback.java deleted file mode 100644 index 0ea3a662fd..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/SwingCallback.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.concurrency; - -import javax.swing.SwingUtilities; - -/** - * Callback that executes in the Swing thread. - * - * @author Simon Templer - * @param the job result type - */ -public abstract class SwingCallback implements Callback { - - /** - * @see Callback#done(java.lang.Object) - */ - @Override - public void done(final R result) { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - finished(result); - } - }); - } - - /** - * Called then job is done - * - * @param result the job result - */ - protected abstract void finished(R result); - - /** - * @see Callback#failed(java.lang.Throwable) - */ - @Override - public void failed(final Throwable e) { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - error(e); - } - }); - } - - /** - * Called when the job failed - * - * @param e the error - */ - protected abstract void error(Throwable e); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/SwtCallback.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/SwtCallback.java deleted file mode 100644 index 8a60563866..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/concurrency/SwtCallback.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.concurrency; - -import org.eclipse.swt.widgets.Display; - -/** - * Callback that executes in the SWT display thread. - * - * @author Simon Templer - * @param the job result type - */ -public abstract class SwtCallback implements Callback { - - private final Display display; - - /** - * Creates a SWT call-back - */ - public SwtCallback() { - this(null); - } - - /** - * Creates a SWT call-back - * - * @param display the display of the call-back thread - */ - public SwtCallback(final Display display) { - if (display != null) - this.display = display; - else - this.display = Display.getCurrent(); - } - - /** - * @see Callback#done(java.lang.Object) - */ - @Override - public void done(final R result) { - display.asyncExec(new Runnable() { - - @Override - public void run() { - finished(result); - } - }); - } - - /** - * Called then job is done - * - * @param result the job result - */ - protected abstract void finished(R result); - - /** - * @see Callback#failed(java.lang.Throwable) - */ - @Override - public void failed(final Throwable e) { - display.asyncExec(new Runnable() { - - @Override - public void run() { - error(e); - } - }); - } - - /** - * Called when the job failed - * - * @param e the error - */ - protected abstract void error(Throwable e); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/images/configure.gif b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/images/configure.gif deleted file mode 100644 index 18ffabe77f..0000000000 Binary files a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/images/configure.gif and /dev/null differ diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/images/loading.png b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/images/loading.png deleted file mode 100644 index 0be8375166..0000000000 Binary files a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/images/loading.png and /dev/null differ diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/AbstractMarker.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/AbstractMarker.java deleted file mode 100644 index b3d5cabac9..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/AbstractMarker.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.marker; - -import gnu.trove.TIntObjectHashMap; - -import java.awt.Graphics2D; -import java.awt.Rectangle; - -import org.jdesktop.swingx.mapviewer.PixelConverter; - -import de.fhg.igd.mapviewer.marker.area.Area; - -/** - * Abstract marker implementation - * - * @author Simon Templer - * @param the context type - */ -public abstract class AbstractMarker implements Marker { - - private final TIntObjectHashMap areas = new TIntObjectHashMap(); - - /** - * @see Marker#paint(Graphics2D, PixelConverter, int, Object, Rectangle) - */ - @Override - public void paint(Graphics2D g, PixelConverter converter, int zoom, T context, - Rectangle gBounds) { - synchronized (areas) { - if (!areas.containsKey(zoom)) { - Area area = paintMarker(g, context, converter, zoom, gBounds, true); - areas.put(zoom, area); - return; - } - } - paintMarker(g, context, converter, zoom, gBounds, false); - } - - /** - * Paint a marker. - * - * @param g the graphics device - * @param context the painting context - * @param converter the pixel converter - * @param zoom the zoom level - * @param gBounds the graphics bounds - * @param calculateArea if the area representing the marker should be - * calculated, if false is given here the return - * value is ignored and should be null - * @return the area that represents the marker, this may be - * null if the marker represents no area, or if - * calculateArea is false - */ - protected abstract Area paintMarker(Graphics2D g, T context, PixelConverter converter, int zoom, - Rectangle gBounds, boolean calculateArea); - - /** - * @see Marker#getArea(int) - */ - @Override - public Area getArea(int zoom) { - synchronized (areas) { - return areas.get(zoom); - } - } - - /** - * @see Marker#reset() - */ - @Override - public void reset() { - synchronized (areas) { - areas.clear(); - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/BoundingBoxMarker.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/BoundingBoxMarker.java deleted file mode 100644 index e8cd4e2efe..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/BoundingBoxMarker.java +++ /dev/null @@ -1,212 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.marker; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.geom.Point2D; - -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.PixelConverter; - -import de.fhg.igd.geom.BoundingBox; -import de.fhg.igd.mapviewer.marker.area.Area; -import de.fhg.igd.mapviewer.marker.area.BoxArea; -import de.fhg.igd.mapviewer.waypoints.SelectableWaypoint; - -/** - * Marker that paints way-point bounding boxes - * - * @author Simon Templer - * @param the context type - */ -public abstract class BoundingBoxMarker> extends AbstractMarker { - - /** - * @see AbstractMarker#paintMarker(Graphics2D, Object, PixelConverter, int, - * Rectangle, boolean) - */ - @Override - protected Area paintMarker(Graphics2D g, T context, PixelConverter converter, int zoom, - Rectangle gBounds, boolean calculateArea) { - if (context.isPoint()) { - return paintFallback(g, context, converter, zoom, gBounds, calculateArea); - } - - BoundingBox bb = context.getBoundingBox(); - int code = SelectableWaypoint.COMMON_EPSG; - - GeoPosition pos1 = new GeoPosition(bb.getMinX(), bb.getMinY(), code); - GeoPosition pos2 = new GeoPosition(bb.getMaxX(), bb.getMaxY(), code); - - try { - Point2D p1 = converter.geoToPixel(pos1, zoom); - Point2D p2 = converter.geoToPixel(pos2, zoom); - - int minX = (int) Math.min(p1.getX(), p2.getX()); - int minY = (int) Math.min(p1.getY(), p2.getY()); - int maxX = (int) Math.max(p1.getX(), p2.getX()); - int maxY = (int) Math.max(p1.getY(), p2.getY()); - - int width = maxX - minX; - int height = maxY - minY; - - // decide whether it is to small to paint - if (isToSmall(width, height, zoom)) { - return paintFallback(g, context, converter, zoom, gBounds, calculateArea); - } - - return doPaintMarker(g, context, converter, zoom, minX, minY, maxX, maxY, gBounds, - calculateArea); - } catch (IllegalGeoPositionException e) { - // use fallback marker instead - return paintFallback(g, context, converter, zoom, gBounds, calculateArea); - } - } - - /** - * Paint the marker. - * - * @param g the graphics device - * @param context the painting context - * @param converter the pixel converter - * @param zoom the zoom level - * @param minX the bounding box minimum x pixel coordinate - * @param minY the bounding box minimum y pixel coordinate - * @param maxX the bounding box maximum x pixel coordinate - * @param maxY the bounding box maximum y pixel coordinate - * @param gBounds the graphics bounds - * @param calculateArea if the area representing the marker should be - * calculated, if false is given here the return - * value is ignored and should be null - * @return the area that represents the marker - */ - protected Area doPaintMarker(Graphics2D g, T context, PixelConverter converter, int zoom, - int minX, int minY, int maxX, int maxY, Rectangle gBounds, boolean calculateArea) { - if (applyFill(g, context)) { - g.fillRect(minX, minY, maxX - minX + 1, maxY - minY + 1); - } - - if (applyStroke(g, context)) { - g.drawRect(minX, minY, maxX - minX + 1, maxY - minY + 1); - } - - if (calculateArea) { - return new BoxArea(minX, minY, maxX, maxY); - } - else { - return null; - } - } - - /** - * Determines if painting a fill is allowed, if yes applies the fill style - * to the given graphics.
- *
- * By default sets the paint color to - * {@link #getPaintColor(SelectableWaypoint)} and allows painting a fill. - * - * @param g the graphics - * @param context the paint context - * @return if painting a fill is allowed - */ - protected boolean applyFill(Graphics2D g, T context) { - g.setPaint(getPaintColor(context)); - return true; - } - - /** - * Determines if painting lines is allowed, if yes applies the stroke style - * to the given graphics.
- *
- * By default sets the drawing color to - * {@link #getBorderColor(SelectableWaypoint)} and allows painting lines. - * - * @param g the graphics - * @param context the paint context - * @return if painting lines is allowed - */ - protected boolean applyStroke(Graphics2D g, T context) { - g.setColor(getBorderColor(context)); - return true; - } - - /** - * Decides whether a bounding box is to small to paint - * - * @param width the width in pixels - * @param height the height in pixels - * @param zoom the zoom level - * @return if the bounding box is to small and instead the fall-back marker - * should be used - */ - protected boolean isToSmall(int width, int height, int zoom) { - return width <= 2 || height <= 2 || (width <= 4 && height <= 4); - } - - /** - * Paint the fall-back marker - * - * @param g the graphics device - * @param context the way-point - * @param converter the converter - * @param zoom the zoom level - * @param gBounds the graphics bounds - * @param calculateArea if the area representing the marker should be - * calculated, if false is given here the return - * value is ignored and should be null - * @return the area that represents the marker - */ - protected Area paintFallback(Graphics2D g, T context, PixelConverter converter, int zoom, - Rectangle gBounds, boolean calculateArea) { - Marker marker = getFallbackMarker(context); - marker.paint(g, converter, zoom, context, gBounds); - if (calculateArea) { - return marker.getArea(zoom); - } - else { - return null; - } - } - - /** - * Get the paint color - * - * @param context the painting context - * @return the paint color - */ - protected abstract Color getPaintColor(T context); - - /** - * Get the border color - * - * @param context the painting context - * @return the border color - */ - protected abstract Color getBorderColor(T context); - - /** - * Get the fall-back marker to use for painting when geo conversion fails or - * the bounding box would be to small - * - * @param context the context object - * @return the fall-back marker - */ - protected abstract Marker getFallbackMarker(T context); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/CachingPainter.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/CachingPainter.java deleted file mode 100644 index df4d459ab6..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/CachingPainter.java +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.marker; - -import java.awt.AlphaComposite; -import java.awt.Composite; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.image.BufferedImage; -import java.lang.ref.SoftReference; - -import org.jdesktop.swingx.graphics.GraphicsUtilities; - -/** - * A painter caching its result in a {@link BufferedImage} - * - * @param the painter context type - * @author Simon Templer - */ -public abstract class CachingPainter { - - private transient SoftReference cachedImage; - private int originX = 0; - private int originY = 0; - - private boolean dirty = false; - private boolean antialiasing = true; - - private static Graphics2D graphicsDummy = null; - - /** - * Paint on a graphics device - * - * @param g the graphics device - * @param context the painting context - * @param x the x coordinate of position to paint at - * @param y the y coordinate of position to paint at - */ - public void paint(Graphics2D g, T context, int x, int y) { - if (dirty || cachedImage == null || cachedImage.get() == null) { - // paint on image - doPaint(context); - } - - BufferedImage img = cachedImage.get(); - - if (img != null) { - configureGraphics(g); - g.drawImage(img, x - originX, y - originY, null); - } - - /* - * test g.setColor(Color.WHITE); g.drawRect(-2, -2, 4, 4); - */ - } - - /** - * Do the painting. Implementations of this method must call - * {@link #beginPainting(int, int, int, int)} to get a graphics object and - * {@link #endPainting(Graphics2D)} to finish painting. - * - * @param context the painting context - */ - protected abstract void doPaint(T context); - - /** - * Start the painting by creating a graphics object to paint on - * - * @param width the desired width - * @param height the desired height - * @param originX the translation of the origin in x-direction - * @param originY the translation of the origin in y-direction - * @return the graphics device to use for painting - */ - protected Graphics2D beginPainting(int width, int height, int originX, int originY) { - this.originX = originX; - this.originY = originY; - - BufferedImage img = (cachedImage == null) ? (null) : (cachedImage.get()); - clearCache(); - boolean clear = true; - - if (img == null || img.getWidth() != width || img.getHeight() != height) { - img = GraphicsUtilities.createCompatibleTranslucentImage(width, height); - cachedImage = new SoftReference(img); - clear = false; - } - - Graphics2D gfx = img.createGraphics(); - - gfx.setClip(0, 0, width, height); - - if (clear) { - Composite composite = gfx.getComposite(); - gfx.setComposite(AlphaComposite.Clear); - gfx.fillRect(0, 0, width, height); - gfx.setComposite(composite); - } - - gfx.translate(originX, originY); - configureGraphics(gfx); - - return gfx; - } - - /** - * Finishes the painting, must be called always after calling - * {@link #beginPainting(int, int, int, int)} when painting is done. - * - * @param gfx the graphics object - */ - protected void endPainting(Graphics2D gfx) { - gfx.dispose(); - - dirty = false; - } - - /** - * Mark the painter as dirty, it will be repainted on the next call to - * {@link #paint(Graphics2D, Object, int, int)} - */ - public void markDirty() { - if (!dirty) { - clearCache(); - dirty = true; - } - } - - /** - * @param antialiasing the anti-aliasing to set - */ - public void setAntialiasing(boolean antialiasing) { - this.antialiasing = antialiasing; - } - - /** - * Clears the cached image - */ - protected void clearCache() { - if (cachedImage != null) { - BufferedImage img = cachedImage.get(); - if (img != null) { - img.flush(); - } - } - } - - /** - * Configure the given graphics - * - * @param gfx the graphics device - */ - protected void configureGraphics(Graphics2D gfx) { - if (antialiasing) { - gfx.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_ON); - } - else { - gfx.setRenderingHint(RenderingHints.KEY_ANTIALIASING, - RenderingHints.VALUE_ANTIALIAS_OFF); - } - } - - /** - * Get the dummy graphics device - * - * @return the dummy graphics device - */ - protected Graphics2D getGraphicsDummy() { - if (graphicsDummy == null) { - BufferedImage image = GraphicsUtilities.createCompatibleTranslucentImage(32, 32); - graphicsDummy = image.createGraphics(); - } - - configureGraphics(graphicsDummy); - - return graphicsDummy; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/CircleMarker.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/CircleMarker.java deleted file mode 100644 index cd0c1d6f40..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/CircleMarker.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.marker; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Polygon; - -import de.fhg.igd.mapviewer.marker.area.Area; -import de.fhg.igd.mapviewer.marker.area.PolygonArea; - -/** - * A circle shaped marker - * - * @param the painter context type - * @author Simon Templer - */ -public abstract class CircleMarker extends SimpleMarker { - - private final int size; - - /** - * Creates a circle marker with the given size - * - * @param size the circle size - */ - public CircleMarker(final int size) { - this.size = size; - } - - /** - * Get the paint color - * - * @param context the painting context - * @return the paint color - */ - protected abstract Color getPaintColor(T context); - - /** - * Get the border color - * - * @param context the painting context - * @return the border color - */ - protected abstract Color getBorderColor(T context); - - /** - * Get the marker color - * - * @param context the painting context - * @return the marker color - */ - protected abstract Color getMarkerColor(T context); - - /** - * Determine if a marker shall be shown - * - * @param context the painting context - * @return if a marker shall be shown - */ - protected abstract boolean showMarker(T context); - - /** - * @see SimpleMarker#paintMarker(Object) - */ - @Override - protected Area paintMarker(T context) { - int maxSize = Math.max(2 * 11, size + 2); - - Graphics2D g = beginPainting(maxSize, maxSize, maxSize / 2, maxSize / 2); - try { - g.setPaint(getPaintColor(context)); - g.fillOval(-size / 2, -size / 2, size, size); - - g.setColor(getBorderColor(context)); - g.drawOval(-size / 2 - 1, -size / 2 - 1, size + 1, size + 1); - - if (showMarker(context)) { - g.setPaint(getMarkerColor(context)); - Polygon triangle = new Polygon(); - triangle.addPoint(0, 0); - triangle.addPoint(-11, -11); - triangle.addPoint(11, -11); - g.fill(triangle); - - return new PolygonArea( - new Polygon(new int[] { -11, 11 + 1, size / 2 + 1, -size / 2 - 1 }, - new int[] { -11, -11, size / 2 + 1, size / 2 + 1 }, 4)); - } - else - return new PolygonArea(new Polygon( - new int[] { -size / 2 - 1, size / 2 + 1, size / 2 + 1, -size / 2 - 1 }, - new int[] { -size / 2 - 1, -size / 2 - 1, size / 2 + 1, size / 2 + 1 }, 4)); - } finally { - endPainting(g); - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/ImageMarker.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/ImageMarker.java deleted file mode 100644 index 966acb978f..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/ImageMarker.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.marker; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.image.BufferedImage; -import java.awt.image.ColorModel; -import java.awt.image.PixelGrabber; - -import de.fhg.igd.mapviewer.marker.area.Area; -import de.fhg.igd.mapviewer.marker.area.BoxArea; -import de.fhg.igd.mapviewer.waypoints.SelectableWaypoint; - -/** - * An image marker - * - * @param the painter context type - * @author Simon Templer - */ -public class ImageMarker> extends SimpleMarker { - - private int maxHeight = 32; - - private final BufferedImage image; - - /** - * Creates an image marker - * - * @param image the icon image - */ - public ImageMarker(final BufferedImage image) { - this.image = image; - } - - /** - * @see SimpleMarker#paintMarker(java.lang.Object) - */ - @Override - protected Area paintMarker(T context) { - int width = image.getWidth(); - int height = image.getHeight(); - - if (height > maxHeight) { - float shrink = (float) maxHeight / (float) height; - height = maxHeight; - width = (int) (width * shrink); - } - - int x = -width / 2; - int y = -height / 2; - - // create graphics for image plus one pixel border - Graphics2D g = beginPainting(width + 2, height + 2, width / 2 + 1, height / 2 + 1); - try { - g.drawImage(image, x, y, x + width, y + height, 0, 0, image.getWidth(), - image.getHeight(), null); - - // shadow - if (!hasAlpha(image)) { - g.setColor(new Color(0, 0, 0, 180)); - // g.setColor((selected)?(new Color(200, 0, 0, 180)):(new - // Color(0, 0, 200, 180))); - g.fillPolygon( - new int[] { x + 3, x + width, x + width, x + width + 3, x + width + 3, - x + 3 }, - new int[] { y + height, y + height, y + 3, y + 3, y + height + 3, - y + height + 3 }, - 6); - } - - // selection - if (context.isSelected()) { - g.setColor(Color.RED); - g.drawRect(x - 1, y - 1, width + 1, height + 1); - } - } finally { - endPainting(g); - } - - return new BoxArea(x, y, x + width, y + height); - } - - /** - * @param maxHeight the maxHeight to set - */ - public void setMaxHeight(int maxHeight) { - this.maxHeight = maxHeight; - } - - /** - * Determines if an image has transparent pixels - * - * @param image the {@link Image} - * @return if the given image has transparent pixels - */ - public static boolean hasAlpha(Image image) { - // If buffered image, the color model is readily available - if (image instanceof BufferedImage) { - BufferedImage bimage = (BufferedImage) image; - return bimage.getColorModel().hasAlpha(); - } - - // Use a pixel grabber to retrieve the image's color model; - // grabbing a single pixel is usually sufficient - PixelGrabber pg = new PixelGrabber(image, 0, 0, 1, 1, false); - try { - pg.grabPixels(); - } catch (InterruptedException e) { - // ignore - } - - // Get the image's color model - ColorModel cm = pg.getColorModel(); - return cm.hasAlpha(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/LabelMarker.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/LabelMarker.java deleted file mode 100644 index 74c0bfc8bb..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/LabelMarker.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.marker; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Polygon; - -import de.fhg.igd.mapviewer.marker.area.Area; -import de.fhg.igd.mapviewer.marker.area.PolygonArea; - -/** - * A label marker - * - * @param the painter context type - * @author Simon Templer - */ -public abstract class LabelMarker extends SimpleMarker { - - /** - * Get the paint color - * - * @param context the context object - * @return the paint color for this object - */ - protected abstract Color getPaintColor(T context); - - // protected abstract Color getBorderColor(T context); - - /** - * Get the name of the given context object - * - * @param context the context object - * - * @return the name for this object - */ - protected String getName(T context) { - return context.toString(); - } - - /** - * @see SimpleMarker#paintMarker(java.lang.Object) - */ - @Override - protected Area paintMarker(T context) { - String name = getName(context); - Graphics2D dummy = getGraphicsDummy(); - - int width = (int) dummy.getFontMetrics().getStringBounds(name, dummy).getWidth(); - - Graphics2D g = beginPainting(width + 10, 30, width / 2 + 5, 0); - try { - g.setPaint(getPaintColor(context)); - Polygon triangle = new Polygon(); - triangle.addPoint(0, 0); - triangle.addPoint(11, 11); - triangle.addPoint(-11, 11); - g.fill(triangle); - g.fillRoundRect(-width / 2 - 5, 10, width + 10, 20, 10, 10); - - // g.setColor(borderColor); - // g.drawRoundRect(-width/2 -5, 10, width+10, 20, 10, 10); - - // bounding polygon - // (0,0), (11,11), (width/2 + 5, 10), (width/2 + 5, 30), - // (-width/2 - 5, 30), (-width/2 - 5, 10), (-11, 11) - Polygon bounds = new Polygon(new int[] { 0, 11, width / 2 + 5, width / 2 + 5, - -width / 2 - 5, -width / 2 - 5, -11 }, new int[] { 0, 11, 10, 30, 30, 10, 11 }, - 7); - - // draw text w/ shadow - g.setPaint(Color.BLACK); - g.drawString(name, -width / 2 - 1, 26 - 1); // shadow - // g.drawString(name, -width/2-1, 26-1); //shadow - g.setPaint(Color.WHITE); - g.drawString(name, -width / 2, 26); // text - - return new PolygonArea(bounds); - } finally { - endPainting(g); - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/Marker.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/Marker.java deleted file mode 100644 index f7cbe1ad2f..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/Marker.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.marker; - -import java.awt.Graphics2D; -import java.awt.Rectangle; - -import org.jdesktop.swingx.mapviewer.PixelConverter; - -import de.fhg.igd.mapviewer.marker.area.Area; - -/** - * A marker - * - * @author Simon Templer - * @param the context type - */ -public interface Marker { - - /** - * Paint on a graphics device - * - * @param g the graphics device - * @param converter the pixel converter - * @param zoom the current map zoom level - * @param context the painting context - * @param gBounds the graphics bounds - */ - public void paint(Graphics2D g, PixelConverter converter, int zoom, T context, - Rectangle gBounds); - - /** - * Get the marker area for the respective zoom level - * - * @param zoom the zoom level - * - * @return the area - */ - public abstract Area getArea(int zoom); - - /** - * Reset the marker when the map was changed - */ - public abstract void reset(); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/SimpleCircleMarker.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/SimpleCircleMarker.java deleted file mode 100644 index 4935e5056e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/SimpleCircleMarker.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.marker; - -import java.awt.Color; - -/** - * A simple circle marker with given colors - * - * @author Simon Templer - */ -public class SimpleCircleMarker extends CircleMarker { - - private final Color borderColor; - - private final Color paintColor; - - private final Color markerColor; - - private final boolean showMarker; - - /** - * Constructor - * - * @param size the circle size - * @param paintColor the fill color of the circle - * @param borderColor the border color of the circle - * @param markerColor the selection marker color - * @param showMarker if the selection marker shall be shown - */ - public SimpleCircleMarker(int size, Color paintColor, Color borderColor, Color markerColor, - boolean showMarker) { - super(size); - - this.borderColor = borderColor; - this.paintColor = paintColor; - this.markerColor = markerColor; - this.showMarker = showMarker; - } - - /** - * @see CircleMarker#getBorderColor(Object) - */ - @Override - protected Color getBorderColor(Object context) { - return borderColor; - } - - /** - * @see CircleMarker#getPaintColor(Object) - */ - @Override - protected Color getPaintColor(Object context) { - return paintColor; - } - - /** - * @see CircleMarker#getMarkerColor(Object) - */ - @Override - protected Color getMarkerColor(Object context) { - return markerColor; - } - - /** - * @see CircleMarker#showMarker(Object) - */ - @Override - protected boolean showMarker(Object context) { - return showMarker; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/SimpleMarker.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/SimpleMarker.java deleted file mode 100644 index 1aef9aea94..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/SimpleMarker.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.marker; - -import java.awt.Graphics2D; -import java.awt.Rectangle; - -import org.jdesktop.swingx.mapviewer.PixelConverter; - -import de.fhg.igd.mapviewer.marker.area.Area; - -/** - * A simple marker that paints itself the same way regardless of the zoom level - * or map - * - * @param the painter context type - * @author Simon Templer - */ -public abstract class SimpleMarker extends CachingPainterimplements Marker { - - private Area area; - - /** - * @see CachingPainter#doPaint(java.lang.Object) - */ - @Override - protected final void doPaint(T context) { - area = paintMarker(context); - } - - /** - * Paint a marker. Implementations of this method must call - * {@link #beginPainting(int, int, int, int)} to get a graphics object and - * {@link #endPainting(Graphics2D)} to finish painting. - * - * @param context the painting context - * - * @return the area that represents the marker - */ - protected abstract Area paintMarker(T context); - - /** - * @see Marker#paint(Graphics2D, PixelConverter, int, Object, Rectangle) - */ - @Override - public void paint(Graphics2D g, PixelConverter converter, int zoom, T context, - Rectangle gBounds) { - paint(g, context, 0, 0); - } - - /** - * @see Marker#reset() - */ - @Override - public void reset() { - // do nothing - } - - /** - * @see Marker#getArea(int) - */ - @Override - public Area getArea(int zoom) { - return area; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/area/Area.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/area/Area.java deleted file mode 100644 index f91b4e78f6..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/area/Area.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.marker.area; - -import java.awt.Polygon; -import java.awt.Rectangle; - -/** - * A pixel area on the map, represents a marker - * - * @author Simon Templer - */ -public interface Area { - - /** - * Get the area - * - * @return the area in square pixels - */ - public double getArea(); - - /** - * Determines if the given pixel coordinates are contained in the area - * - * @param x the pixel x ordinate - * @param y the pixel y ordinate - * @return if the pixel is contained in the area - */ - public boolean contains(int x, int y); - - /** - * Determines if the area is contained in the given polygon - * - * @param poly the polygon - * @return if the polygon contains the area - */ - public boolean containedIn(Polygon poly); - - /** - * Determines if the area is contained in the given rectangle - * - * @param rect the rectangle - * @return if the rectangle contains the area - */ - public boolean containedIn(Rectangle rect); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/area/BoxArea.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/area/BoxArea.java deleted file mode 100644 index fd1f91e2d4..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/area/BoxArea.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.marker.area; - -import java.awt.Polygon; -import java.awt.Rectangle; - -/** - * Area represented by a bounding box - * - * @author Simon Templer - */ -public class BoxArea implements Area { - - private final int minX; - private final int minY; - private final int maxX; - private final int maxY; - - /** - * Constructor - * - * @param minX the minimum x pixel ordinate - * @param minY the minimum y pixel ordinate - * @param maxX the maximum x pixel ordinate - * @param maxY the maximum y pixel ordinate - */ - public BoxArea(int minX, int minY, int maxX, int maxY) { - super(); - this.minX = minX; - this.minY = minY; - this.maxX = maxX; - this.maxY = maxY; - } - - /** - * @see Area#getArea() - */ - @Override - public double getArea() { - return (maxX - minX) * (maxY - minY); - } - - /** - * @see Area#contains(int, int) - */ - @Override - public boolean contains(int x, int y) { - return x <= maxX && x >= minX && y <= maxY && y >= minY; - } - - /** - * @see Area#containedIn(Polygon) - */ - @Override - public boolean containedIn(Polygon poly) { - return poly.contains(minX, minY, maxX - minX, maxY - minY); - } - - /** - * @see Area#containedIn(Rectangle) - */ - @Override - public boolean containedIn(Rectangle rect) { - return rect.contains(minX, minY, maxX - minX, maxY - minY); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/area/MultiArea.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/area/MultiArea.java deleted file mode 100644 index 1a262668c8..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/area/MultiArea.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.marker.area; - -import java.awt.Polygon; -import java.awt.Rectangle; - -/** - * Area represented by multiple areas - * - * @author Simon Templer - */ -public class MultiArea implements Area { - - private final Iterable areas; - - /** - * Constructor - * - * @param areas the areas (iterable will not be copied) - */ - public MultiArea(Iterable areas) { - super(); - this.areas = areas; - } - - /** - * @see Area#getArea() - */ - @Override - public double getArea() { - double sum = 0; - for (Area area : areas) { - sum += area.getArea(); - } - return sum; - } - - /** - * @see Area#contains(int, int) - */ - @Override - public boolean contains(int x, int y) { - for (Area area : areas) { - if (area.contains(x, y)) { - return true; - } - } - return false; - } - - /** - * @see Area#containedIn(Polygon) - */ - @Override - public boolean containedIn(Polygon poly) { - for (Area area : areas) { - if (!area.containedIn(poly)) { - return false; - } - } - return true; - } - - /** - * @see Area#containedIn(Rectangle) - */ - @Override - public boolean containedIn(Rectangle rect) { - for (Area area : areas) { - if (!area.containedIn(rect)) { - return false; - } - } - return true; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/area/PolygonArea.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/area/PolygonArea.java deleted file mode 100644 index 5a94cc389b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/marker/area/PolygonArea.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.marker.area; - -import java.awt.Polygon; -import java.awt.Rectangle; - -import de.fhg.igd.geom.Point2D; - -/** - * Area represented by a polygon - * - * @author Simon Templer - */ -public class PolygonArea implements Area { - - private final Polygon poly; - - private double area; - - private boolean areaInitialized = false; - - private de.fhg.igd.geom.shape.Polygon mmPoly = null; - - /** - * Constructor - * - * @param poly the polygon - */ - public PolygonArea(Polygon poly) { - super(); - this.poly = poly; - } - - /** - * @see Area#getArea() - */ - @Override - public double getArea() { - if (!areaInitialized) { - double area = 0; - - for (int i = 0; i < poly.npoints; i++) { - int j = (i + 1) % poly.npoints; - area += poly.xpoints[i] * poly.ypoints[j]; - area -= poly.ypoints[i] * poly.xpoints[j]; - } - area /= 2.0; - - this.area = ((area < 0) ? (-area) : (area)); - areaInitialized = true; - } - - return area; - } - - /** - * @see Area#contains(int, int) - */ - @Override - public boolean contains(int x, int y) { - return poly.contains(x, y); - } - - /** - * @see Area#containedIn(Polygon) - */ - @Override - public boolean containedIn(Polygon poly) { - return toModelPolygon(poly).contains(toModelPolygon()); - } - - /** - * @see Area#containedIn(Rectangle) - */ - @Override - public boolean containedIn(Rectangle rect) { - return toModelPolygon(rect).contains(toModelPolygon()); - } - - private de.fhg.igd.geom.shape.Polygon toModelPolygon() { - if (mmPoly == null) { - mmPoly = toModelPolygon(poly); - } - return mmPoly; - } - - private static de.fhg.igd.geom.shape.Polygon toModelPolygon(Polygon poly) { - Point2D[] points = new Point2D[poly.npoints]; - for (int i = 0; i < poly.npoints; i++) { - points[i] = new Point2D(poly.xpoints[i], poly.ypoints[i]); - } - return new de.fhg.igd.geom.shape.Polygon(points); - } - - private static de.fhg.igd.geom.shape.Polygon toModelPolygon(Rectangle rect) { - Point2D[] points = new Point2D[4]; - points[0] = new Point2D(rect.x, rect.y); - points[1] = new Point2D(rect.x + rect.width, rect.y); - points[2] = new Point2D(rect.x + rect.width, rect.y + rect.height); - points[3] = new Point2D(rect.x, rect.y + rect.height); - return new de.fhg.igd.geom.shape.Polygon(points); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/messages.properties b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/messages.properties deleted file mode 100644 index f19d5fb1e1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/messages.properties +++ /dev/null @@ -1 +0,0 @@ -BasicMapKit_0=Loading map diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/messages_de.properties b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/messages_de.properties deleted file mode 100644 index 547a04fdfc..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/messages_de.properties +++ /dev/null @@ -1 +0,0 @@ -BasicMapKit_0=Lade Karte diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/painter/TextPainter.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/painter/TextPainter.java deleted file mode 100644 index e23e804a0d..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/painter/TextPainter.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.painter; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.geom.Rectangle2D; - -import org.jdesktop.swingx.mapviewer.JXMapViewer; -import org.jdesktop.swingx.painter.AbstractPainter; - -import de.fhg.igd.mapviewer.BasicMapKit; -import de.fhg.igd.mapviewer.MapPainter; - -/** - * Paints a text - * - * @author Simon Templer - */ -public abstract class TextPainter extends AbstractPainterimplements MapPainter { - - private BasicMapKit mapKit; - - /** - * Create a text painter - * - * @param cacheable if the painter is cacheable, i.e. if the text stays the - * same - */ - public TextPainter(boolean cacheable) { - super(cacheable); - - setAntialiasing(true); - } - - @Override - public void setMapKit(BasicMapKit mapKit) { - this.mapKit = mapKit; - } - - /** - * Get the map kit the painter is associated with - * - * @return the map kit or null - */ - public BasicMapKit getMapKit() { - return mapKit; - } - - @Override - public String getTipText(Point point) { - return null; - } - - @Override - public void dispose() { - // do nothing - } - - /** - * Get the border color to use for the text border. - * - * @return the border color for the text border, null for no - * border - */ - protected Color getBorderColor() { - return null; - } - - @Override - protected void doPaint(Graphics2D g, JXMapViewer object, int width, int height) { - String text = getText(); - Rectangle2D bounds = g.getFontMetrics().getStringBounds(text, g); - - drawText(g, text, bounds, width, height); - } - - /** - * Draw the text. The default implementation draws the text in the bottom - * left corner. - * - * @param g the graphics device to draw an - * @param text the text to draw - * @param bounds the bounds of the text to draw - * @param width the draw surface width - * @param height the draw surface height - * - * @see Graphics2D#drawString(String, int, int) - */ - protected void drawText(Graphics2D g, String text, Rectangle2D bounds, int width, int height) { - drawBorderedString(g, text, 5, (int) bounds.getHeight() + 5); - } - - /** - * Draw a string with a border defined through {@link #getBorderColor()}. - * - * @param g the graphics context - * @param text the text to draw - * @param x the x position - * @param y the y position - * @see #getBorderColor() - */ - protected void drawBorderedString(Graphics2D g, String text, int x, int y) { - // draw border - Color borderColor = getBorderColor(); - if (borderColor != null) { - Color orgColor = g.getColor(); - g.setColor(borderColor); - g.drawString(text, x - 1, y - 1); - g.drawString(text, x - 1, y + 1); - g.drawString(text, x + 1, y - 1); - g.drawString(text, x + 1, y + 1); - g.setColor(orgColor); - } - - g.drawString(text, x, y); - } - - /** - * Get the text to paint - * - * @return the text to paint - */ - protected abstract String getText(); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/AbstractMapServer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/AbstractMapServer.java deleted file mode 100644 index 1c719449ba..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/AbstractMapServer.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server; - -import de.fhg.igd.mapviewer.MapPainter; - -/** - * Abstract {@link MapServer} without a configuration dialog - * - * @author Simon Templer - */ -public abstract class AbstractMapServer implements MapServer { - - private String name; - - /** - * @see MapServer#getName() - */ - @Override - public String getName() { - return name; - } - - /** - * @see MapServer#setName(java.lang.String) - */ - @Override - public void setName(String name) { - this.name = name; - } - - /** - * The default implementation returns null. Please override if - * applicable. - * - * @see MapServer#getMapOverlay() - */ - @Override - public MapPainter getMapOverlay() { - return null; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/ClippingTileProviderDecorator.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/ClippingTileProviderDecorator.java deleted file mode 100644 index 95a04c0423..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/ClippingTileProviderDecorator.java +++ /dev/null @@ -1,440 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server; - -import gnu.trove.TIntArrayList; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.geom.Point2D; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.mapviewer.AbstractTileProviderDecorator; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.JXMapViewer; -import org.jdesktop.swingx.mapviewer.PixelConverter; -import org.jdesktop.swingx.mapviewer.TileProvider; -import org.jdesktop.swingx.mapviewer.TileProviderUtils; -import org.jdesktop.swingx.painter.AbstractPainter; -import org.jdesktop.swingx.painter.Painter; - -/** - * ClippingTileProviderDecorator - * - * @author Simon Templer - */ -public class ClippingTileProviderDecorator extends AbstractTileProviderDecorator { - - /** - * ClippingPainter - */ - public class ClippingPainter extends AbstractPainter { - - private Color customOverlayColor; - - /** - * Default constructor - * - * @param customOverlayColor a custom overlay color, may be - * null - */ - public ClippingPainter(Color customOverlayColor) { - setAntialiasing(true); - setCacheable(false); - this.customOverlayColor = customOverlayColor; - } - - /** - * @see AbstractPainter#doPaint(Graphics2D, Object, int, int) - */ - @Override - protected void doPaint(Graphics2D g, JXMapViewer map, int width, int height) { - Rectangle viewport = map.getViewportBounds(); - final int zoom = map.getZoom(); - - final int mapWidth = getMapWidthInTiles(zoom) * getTileWidth(zoom); - final int mapHeight = getMapHeightInTiles(zoom) * getTileHeight(zoom); - - Point topLeft = getTopLeft(zoom); - Point bottomRight = getBottomRight(zoom); - - Rectangle view = new Rectangle(topLeft); - view.add(bottomRight); - - g.translate(-viewport.x, -viewport.y); - Color back = map.getBackground(); - Color trans = (customOverlayColor != null) ? (customOverlayColor) - : (new Color(back.getRed(), back.getGreen(), back.getBlue(), 90)); - g.setColor(map.getBackground()); - - // draw view border - if (viewport.intersects(view)) { - g.draw(view); - } - - // generate other rects - List rects = new ArrayList(); - - rects.add(new Rectangle(0, 0, topLeft.x, topLeft.y)); - rects.add(new Rectangle(topLeft.x, 0, bottomRight.x - topLeft.x, topLeft.y)); - rects.add(new Rectangle(bottomRight.x, 0, mapWidth - bottomRight.x, topLeft.y)); - - rects.add(new Rectangle(0, topLeft.y, topLeft.x, bottomRight.y - topLeft.y)); - rects.add(new Rectangle(bottomRight.x, topLeft.y, mapWidth - bottomRight.x, - bottomRight.y - topLeft.y)); - - rects.add(new Rectangle(0, bottomRight.y, topLeft.x, mapHeight - bottomRight.y)); - rects.add(new Rectangle(topLeft.x, bottomRight.y, bottomRight.x - topLeft.x, - mapHeight - bottomRight.y)); - rects.add(new Rectangle(bottomRight.x, bottomRight.y, mapWidth - bottomRight.x, - mapHeight - bottomRight.y)); - - g.setPaint(trans); - - for (Rectangle rect : rects) { - if (viewport.intersects(rect)) - g.fill(rect); - } - - g.translate(viewport.x, viewport.y); - } - - } - - /** - * PixelConverter decorator that converts pixels conforming to the - * {@link ClippingTileProviderDecorator}'s map clipping - */ - public class PixelConverterDecorator implements PixelConverter { - - private final PixelConverter converter; - - /** - * Constructor - * - * @param converter the internal pixel converter - */ - public PixelConverterDecorator(PixelConverter converter) { - this.converter = converter; - } - - /** - * @see PixelConverter#geoToPixel(GeoPosition, int) - */ - @Override - public Point2D geoToPixel(final GeoPosition pos, final int zoom) - throws IllegalGeoPositionException { - Point2D result = converter.geoToPixel(pos, zoom); - - // move point (remove offset pixels) - return new Point2D.Double(result.getX() - getXTileOffset(zoom) * getTileWidth(zoom), - result.getY() - getYTileOffset(zoom) * getTileHeight(zoom)); - } - - /** - * @see PixelConverter#pixelToGeo(Point2D, int) - */ - @Override - public GeoPosition pixelToGeo(final Point2D pixelCoordinate, final int zoom) { - // move point (add offset pixels) - Point2D moved = new Point2D.Double( - pixelCoordinate.getX() + getXTileOffset(zoom) * getTileWidth(zoom), - pixelCoordinate.getY() + getYTileOffset(zoom) * getTileHeight(zoom)); - - return converter.pixelToGeo(moved, zoom); - } - - /** - * @see PixelConverter#getMapEpsg() - */ - @Override - public int getMapEpsg() { - return converter.getMapEpsg(); - } - - /** - * @see PixelConverter#supportsBoundingBoxes() - */ - @Override - public boolean supportsBoundingBoxes() { - return converter.supportsBoundingBoxes(); - } - - } - - private static final Log log = LogFactory.getLog(ClippingTileProviderDecorator.class); - - private final TIntArrayList xTileOffset = new TIntArrayList(); - private final TIntArrayList xTileRange = new TIntArrayList(); - private final TIntArrayList yTileOffset = new TIntArrayList(); - private final TIntArrayList yTileRange = new TIntArrayList(); - - private final ArrayList topLeft = new ArrayList(); - private final ArrayList bottomRight = new ArrayList(); - - private final int maxZoom; - - private final Painter painter; - - private PixelConverter lastConverter; - private PixelConverterDecorator lastConverterDecorator; - - /** - * Constructor - * - * @param tileProvider the tile provider - * @param topLeft the top left constraint - * @param bottomRight the bottom right constraint - */ - public ClippingTileProviderDecorator(final TileProvider tileProvider, final GeoPosition topLeft, - final GeoPosition bottomRight) { - this(tileProvider, topLeft, bottomRight, 1); - } - - /** - * Constructor - * - * @param tileProvider the tile provider - * @param topLeft the top left constraint - * @param bottomRight the bottom right constraint - * @param minRange the minimum visible range - */ - public ClippingTileProviderDecorator(final TileProvider tileProvider, final GeoPosition topLeft, - final GeoPosition bottomRight, int minRange) { - this(tileProvider, topLeft, bottomRight, minRange, null); - } - - /** - * Constructor - * - * @param tileProvider the tile provider - * @param topLeft the top left constraint - * @param bottomRight the bottom right constraint - * @param minRange the minimum visible range - * @param customOverlayColor custom overlay color to use, may be - * null - */ - public ClippingTileProviderDecorator(final TileProvider tileProvider, final GeoPosition topLeft, - final GeoPosition bottomRight, int minRange, Color customOverlayColor) { - super(tileProvider); - - if (minRange <= 0) - minRange = 1; - - int zoom = tileProvider.getMinimumZoom(); - boolean tryNextZoom = true; - - // determine valid zoom levels and their tile offsets/ranges - while (tryNextZoom && zoom <= tileProvider.getMaximumZoom()) { - try { - Point2D topLeftPixel = tileProvider.getConverter().geoToPixel(topLeft, zoom); - Point2D bottomRightPixel = tileProvider.getConverter().geoToPixel(bottomRight, - zoom); - - int xMin = ((int) topLeftPixel.getX()) / tileProvider.getTileWidth(zoom); - int yMin = ((int) topLeftPixel.getY()) / tileProvider.getTileHeight(zoom); - int xMax = ((int) bottomRightPixel.getX()) / tileProvider.getTileWidth(zoom); - int yMax = ((int) bottomRightPixel.getY()) / tileProvider.getTileHeight(zoom); - - // check for validity - if (xMin <= xMax && yMin <= yMax - && TileProviderUtils.isValidTile(tileProvider, xMin, yMin, zoom) - && TileProviderUtils.isValidTile(tileProvider, xMax, yMax, zoom)) { - // valid tiles, enter offset and ranges - xTileOffset.add(xMin); - xTileRange.add(xMax - xMin + 1); - - yTileOffset.add(yMin); - yTileRange.add(yMax - yMin + 1); - - this.topLeft.add(new Point( - (int) topLeftPixel.getX() - xMin * tileProvider.getTileWidth(zoom), - (int) topLeftPixel.getY() - yMin * tileProvider.getTileHeight(zoom))); - this.bottomRight.add(new Point( - (int) bottomRightPixel.getX() - xMin * tileProvider.getTileWidth(zoom), - (int) bottomRightPixel.getY() - - yMin * tileProvider.getTileHeight(zoom))); - - if (xMax - xMin + 1 <= minRange || yMax - yMin + 1 <= minRange) - tryNextZoom = false; // we reached the max zoom - else - zoom++; // prepare next zoom - } - else { - // invalid tiles - tryNextZoom = false; - zoom--; // previous zoom - } - } catch (IllegalGeoPositionException e) { - // invalid positions or conversion failed - tryNextZoom = false; - zoom--; // previous zoom - } - } - - if (zoom < getMinimumZoom()) { - throw new IllegalArgumentException("No zoom levels are valid for clipping"); //$NON-NLS-1$ - } - else { - maxZoom = zoom; - - painter = new ClippingPainter(customOverlayColor); - - log.info("Initialized ClippingTileProviderDecorator with minZoom = " //$NON-NLS-1$ - + tileProvider.getMinimumZoom() + ", maxZoom = " + maxZoom); //$NON-NLS-1$ - } - } - - private int getXTileOffset(final int zoom) { - int index = zoom - tileProvider.getMinimumZoom(); - if (index < 0 || index >= xTileOffset.size()) - throw new IllegalArgumentException("Illegal zoom value: " + zoom); //$NON-NLS-1$ - else - return xTileOffset.get(index); - } - - private int getXTileRange(final int zoom) { - int index = zoom - tileProvider.getMinimumZoom(); - if (index < 0 || index >= xTileRange.size()) - throw new IllegalArgumentException("Illegal zoom value: " + zoom); //$NON-NLS-1$ - else - return xTileRange.get(index); - } - - private int getYTileOffset(final int zoom) { - int index = zoom - tileProvider.getMinimumZoom(); - if (index < 0 || index >= yTileOffset.size()) - throw new IllegalArgumentException("Illegal zoom value: " + zoom); //$NON-NLS-1$ - else - return yTileOffset.get(index); - } - - private int getYTileRange(final int zoom) { - int index = zoom - tileProvider.getMinimumZoom(); - if (index < 0 || index >= yTileRange.size()) - throw new IllegalArgumentException("Illegal zoom value: " + zoom); //$NON-NLS-1$ - else - return yTileRange.get(index); - } - - private Point getTopLeft(final int zoom) { - int index = zoom - tileProvider.getMinimumZoom(); - if (index < 0 || index >= topLeft.size()) - throw new IllegalArgumentException("Illegal zoom value: " + zoom); //$NON-NLS-1$ - else - return topLeft.get(index); - } - - private Point getBottomRight(final int zoom) { - int index = zoom - tileProvider.getMinimumZoom(); - if (index < 0 || index >= bottomRight.size()) - throw new IllegalArgumentException("Illegal zoom value: " + zoom); //$NON-NLS-1$ - else - return bottomRight.get(index); - } - - /** - * @see AbstractTileProviderDecorator#getConverter() - */ - @Override - public PixelConverter getConverter() { - PixelConverter converter = super.getConverter(); - - if (converter == null) { - return converter; - } - else if (lastConverterDecorator != null && converter == lastConverter) { - return lastConverterDecorator; - } - else { - lastConverter = converter; - lastConverterDecorator = new PixelConverterDecorator(converter); - return lastConverterDecorator; - } - } - - /** - * @see AbstractTileProviderDecorator#getDefaultZoom() - */ - @Override - public int getDefaultZoom() { - int zoom = super.getDefaultZoom(); - if (zoom > maxZoom) - return maxZoom; - else - return zoom; - } - - /** - * @see AbstractTileProviderDecorator#getMapHeightInTiles(int) - */ - @Override - public int getMapHeightInTiles(int zoom) { - return getYTileRange(zoom); - } - - /** - * @see AbstractTileProviderDecorator#getMapWidthInTiles(int) - */ - @Override - public int getMapWidthInTiles(int zoom) { - return getXTileRange(zoom); - } - - /** - * @see AbstractTileProviderDecorator#getMaximumZoom() - */ - @Override - public int getMaximumZoom() { - return maxZoom; - } - - /** - * @see AbstractTileProviderDecorator#getTileUris(int, int, int) - */ - @Override - public URI[] getTileUris(int x, int y, int zoom) { - try { - return super.getTileUris(x + getXTileOffset(zoom), y + getYTileOffset(zoom), zoom); - } catch (Exception e) { - log.error("Error getting tile uris", e); //$NON-NLS-1$ - return null; - } - } - - /** - * @see AbstractTileProviderDecorator#getTotalMapZoom() - */ - @Override - public int getTotalMapZoom() { - return maxZoom; - } - - /** - * @see TileProvider#getMapOverlayPainter() - */ - @Override - public Painter getMapOverlayPainter() { - return painter; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/CustomTileFactory.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/CustomTileFactory.java deleted file mode 100644 index 5da959ac92..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/CustomTileFactory.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server; - -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileProvider; - -/** - * CustomTileFactory - * - * @author Simon Templer - * - * @version $Id$ - */ -public class CustomTileFactory extends StatusTileFactory /* AbstractTileFactory */ { - - /** - * Constructor - * - * @param tileProvider the tile provider - * @param cache the tile cache - */ - public CustomTileFactory(TileProvider tileProvider, TileCache cache) { - super(tileProvider, cache); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/EmptyMapServer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/EmptyMapServer.java deleted file mode 100644 index de60a5d6ca..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/EmptyMapServer.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server; - -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileFactory; -import org.jdesktop.swingx.mapviewer.empty.EmptyTileFactory; - -/** - * MapServer with no data - * - * @author Simon Templer - * - * @version $Id$ - */ -public class EmptyMapServer extends AbstractMapServer { - - private final EmptyTileFactory factory = new EmptyTileFactory(); - - /** - * @see MapServer#cleanup() - */ - @Override - public void cleanup() { - // do nothing - } - - /** - * @see MapServer#getTileFactory(TileCache) - */ - @Override - public TileFactory getTileFactory(TileCache cache) { - return factory; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/LinearBoundsConverter.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/LinearBoundsConverter.java deleted file mode 100644 index b4175d7974..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/LinearBoundsConverter.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server; - -import java.awt.geom.Point2D; -import java.util.Properties; - -import org.jdesktop.swingx.mapviewer.AbstractPixelConverter; -import org.jdesktop.swingx.mapviewer.GeoConverter; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.PixelConverter; -import org.jdesktop.swingx.mapviewer.TileProvider; - -/** - * PixelConverter that supports a bounded area in a certain crs where linear - * interpolation of the coordinates is allowed. - * - * @author Simon Templer - * - * @version $Id$ - */ -public class LinearBoundsConverter extends AbstractPixelConverter { - - // mandatory properties - /** the name of the minimum x ordinate property */ - public static final String PROP_MIN_X = "minX"; //$NON-NLS-1$ - /** the name of the minimum y ordinate property */ - public static final String PROP_MIN_Y = "minY"; //$NON-NLS-1$ - /** the name of the x range property */ - public static final String PROP_X_RANGE = "xRange"; //$NON-NLS-1$ - /** the name of the y range property */ - public static final String PROP_Y_RANGE = "yRange"; //$NON-NLS-1$ - /** the name of the EPSG code property */ - public static final String PROP_EPSG = "epsg"; //$NON-NLS-1$ - // optional properties - /** the name of the swap axes property */ - public static final String PROP_SWAP_AXES = "swapAxes"; //$NON-NLS-1$ - /** the name of the reverse x property */ - public static final String PROP_REVERSE_X = "reverseX"; //$NON-NLS-1$ - /** the name of the reverse y property */ - public static final String PROP_REVERSE_Y = "reverseY"; //$NON-NLS-1$ - - private final double minX; - private final double minY; - private final double xRange; - private final double yRange; - - private final int epsg; - - private final TileProvider tileProvider; - - private final boolean swapAxes; - private final boolean reverseX; - private final boolean reverseY; - - /** - * Creates a {@link LinearBoundsConverter} and configures it using the given - * {@link Properties} - * - * @param properties the properties defining the parameters - * @param tileProvider the tile provider - */ - public LinearBoundsConverter(Properties properties, TileProvider tileProvider) { - this(GeotoolsConverter.getInstance(), tileProvider, - Double.parseDouble(properties.getProperty(PROP_MIN_X)), - Double.parseDouble(properties.getProperty(PROP_MIN_Y)), - Double.parseDouble(properties.getProperty(PROP_X_RANGE)), - Double.parseDouble(properties.getProperty(PROP_Y_RANGE)), - Integer.parseInt(properties.getProperty(PROP_EPSG)), - Boolean.parseBoolean(properties.getProperty(PROP_SWAP_AXES, "false")), //$NON-NLS-1$ - Boolean.parseBoolean(properties.getProperty(PROP_REVERSE_X, "false")), //$NON-NLS-1$ - Boolean.parseBoolean(properties.getProperty(PROP_REVERSE_Y, "false")) //$NON-NLS-1$ - ); - } - - /** - * Creates a {@link LinearBoundsConverter} - * - * @param geoConverter the GEO converter - * @param tileProvider the tile provider - * @param minX the minimum x ordinate - * @param minY the minimum y ordinate - * @param xRange the range in x-direction - * @param yRange the range in y-direction - * @param epsg the EPSG code of the SRS - * @param swapAxes if the axes shall be swapped - * @param reverseX if the x-axis shall be reversed - * @param reverseY if the y-axis shall be reversed - */ - public LinearBoundsConverter(final GeoConverter geoConverter, final TileProvider tileProvider, - final double minX, final double minY, final double xRange, final double yRange, - final int epsg, final boolean swapAxes, final boolean reverseX, - final boolean reverseY) { - super(geoConverter); - - this.tileProvider = tileProvider; - - this.minX = minX; - this.minY = minY; - this.xRange = xRange; - this.yRange = yRange; - - this.epsg = epsg; - - this.swapAxes = swapAxes; - this.reverseX = reverseX; - this.reverseY = reverseY; - } - - /** - * @see PixelConverter#geoToPixel(GeoPosition, int) - */ - @Override - public Point2D geoToPixel(GeoPosition pos, final int zoom) throws IllegalGeoPositionException { - // convert to desired epsg code - pos = geoConverter.convert(pos, epsg); - - // check position - in bounds? - if (pos.getX() < minX || pos.getX() > minX + xRange || pos.getY() < minY - || pos.getY() > minY + yRange) - throw new IllegalGeoPositionException("GeoPosition out of bounds: " + pos); //$NON-NLS-1$ - - // calculate range fractions - double xFrac = ((pos.getX() - minX) / xRange); - double yFrac = ((pos.getY() - minY) / yRange); - - // reverse fractions if needed - if (reverseX) - xFrac = 1.0 - xFrac; - if (reverseY) - yFrac = 1.0 - yFrac; - - // swap fractions if needed - if (swapAxes) { - double tmpFrac = xFrac; - xFrac = yFrac; - yFrac = tmpFrac; - } - - // calculate pixels - try { - double x = xFrac * tileProvider.getMapWidthInTiles(zoom) - * tileProvider.getTileWidth(zoom); - double y = yFrac * tileProvider.getMapHeightInTiles(zoom) - * tileProvider.getTileHeight(zoom); - - return new Point2D.Double(x, y); - } catch (Exception e) { - throw new IllegalGeoPositionException("Invalid zoom level", e); //$NON-NLS-1$ - } - } - - /** - * @see PixelConverter#pixelToGeo(Point2D, int) - */ - @Override - public GeoPosition pixelToGeo(Point2D pixelCoordinate, int zoom) { - // calculate map width/height - int mapWidth = tileProvider.getMapWidthInTiles(zoom) * tileProvider.getTileWidth(zoom); - int mapHeight = tileProvider.getMapHeightInTiles(zoom) * tileProvider.getTileHeight(zoom); - - // calculate pixel fractions - double xFrac = pixelCoordinate.getX() / mapWidth; - double yFrac = pixelCoordinate.getY() / mapHeight; - - // swap axes if needed - if (swapAxes) { - double tmpFrac = xFrac; - xFrac = yFrac; - yFrac = tmpFrac; - } - - // reverse fractions if needed - if (reverseX) - xFrac = 1.0 - xFrac; - if (reverseY) - yFrac = 1.0 - yFrac; - - // calculate coordinates - double x = minX + xFrac * xRange; - double y = minY + yFrac * yRange; - - return new GeoPosition(x, y, epsg); - } - - /** - * @see PixelConverter#getMapEpsg() - */ - @Override - public int getMapEpsg() { - return epsg; - } - - /** - * @see PixelConverter#supportsBoundingBoxes() - */ - @Override - public boolean supportsBoundingBoxes() { - return true; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/MapServer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/MapServer.java deleted file mode 100644 index f02cd418f6..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/MapServer.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server; - -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileFactory; - -import de.fhg.igd.mapviewer.MapPainter; - -/** - * Interface for map servers - * - * @author Simon Templer - * @version $Id$ - */ -public interface MapServer { - - /** - * Set the map server's name - * - * @param name the name - */ - public void setName(String name); - - /** - * Get the map server's name - * - * @return the name - */ - public String getName(); - - /** - * Get the tile factory - * - * @param cache the tile cache to use - * - * @return the tile factory - */ - public abstract TileFactory getTileFactory(TileCache cache); - - /** - * Get the overlay associated to the map - * - * @return the painter for the map overlay, may be null - */ - public MapPainter getMapOverlay(); - - /** - * Cleanup when the server is no longer used - */ - public abstract void cleanup(); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/MapServerFactory.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/MapServerFactory.java deleted file mode 100644 index 4ccee2d2fa..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/MapServerFactory.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.server; - -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; -import de.fhg.igd.eclipse.util.extension.Prioritizable; - -/** - * Map server factory interface - * - * @author Simon Templer - */ -public interface MapServerFactory extends ExtensionObjectFactory, Prioritizable { - - // concrete typed interface - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/MapServerFactoryCollection.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/MapServerFactoryCollection.java deleted file mode 100644 index 5acfb3835e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/MapServerFactoryCollection.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server; - -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection; - -/** - * MapServerFactory - * - * @author Simon Templer - * - * @version $Id$ - */ -public interface MapServerFactoryCollection - extends ExtensionObjectFactoryCollection { - - // concrete typed interface - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/StatusTileFactory.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/StatusTileFactory.java deleted file mode 100644 index 26217914e6..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/StatusTileFactory.java +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server; - -import java.util.HashSet; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.mapviewer.DefaultTileFactory; -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileInfo; -import org.jdesktop.swingx.mapviewer.TileProvider; - -/** - * StatusTileFactory - * - * @author Simon Templer - * - * @version $Id$ - */ -public class StatusTileFactory extends DefaultTileFactory { - - /** - * Tile load listener - */ - public interface TileLoadListener { - - /** - * Called when the tiles have been reseted - */ - public void reset(); - - /** - * Called when the loading of a tile has started - * - * @param tile the tile - */ - public void loadingStarted(TileInfo tile); - - /** - * Called when the loading of a tile has finished - * - * @param tile the tile - */ - public void loadingFinished(TileInfo tile); - - /** - * Called when the loading of a tile has failed - * - * @param tile the tile - * @param error the error - */ - public void loadingFailed(TileInfo tile, Throwable error); - - /** - * Called when the loading of a tile is retried - * - * @param tile the tile - */ - public void loadingRetry(TileInfo tile); - - } - - private static final Log log = LogFactory.getLog(StatusTileFactory.class); - - private static final Set tileLoadListeners = new HashSet(); - - /** - * Adds a tile load listener - * - * @param listener the listener - */ - public static void addTileLoadListener(TileLoadListener listener) { - tileLoadListeners.add(listener); - } - - /** - * Removes a tile load listener - * - * @param listener the listener - */ - public static void removeTileLoadListener(TileLoadListener listener) { - tileLoadListeners.remove(listener); - } - - private synchronized static void fireReset() { - log.debug("Tile load reset"); //$NON-NLS-1$ - - for (TileLoadListener l : tileLoadListeners) { - l.reset(); - } - } - - private synchronized static void fireLoadingStarted(final TileInfo tile) { - // log.debug("Tile loading started"); - - for (TileLoadListener l : tileLoadListeners) { - l.loadingStarted(tile); - } - } - - private synchronized static void fireLoadingFinished(final TileInfo tile) { - // log.debug("Tile loading finished"); - - for (TileLoadListener l : tileLoadListeners) { - l.loadingFinished(tile); - } - } - - private synchronized static void fireLoadingFailed(final TileInfo tile, final Throwable error) { - // log.warn("Tile loading failed", error); - - for (TileLoadListener l : tileLoadListeners) { - l.loadingFailed(tile, error); - } - } - - private synchronized static void fireLoadingRetry(final TileInfo tile) { - log.debug("Tile loading retry"); //$NON-NLS-1$ - - for (TileLoadListener l : tileLoadListeners) { - l.loadingRetry(tile); - } - } - - /** - * Constructor - * - * @param tileProvider the tile provider - * @param cache the tile cache - */ - public StatusTileFactory(TileProvider tileProvider, TileCache cache) { - super(tileProvider, cache); - - fireReset(); - } - - private class StatusTileRunner extends TileRunner { - - @Override - protected void onFailed(TileInfo tile, Throwable error) { - super.onFailed(tile, error); - - fireLoadingFailed(tile, error); - } - - @Override - protected void onLoaded(TileInfo tile) { - super.onLoaded(tile); - - fireLoadingFinished(tile); - } - - @Override - protected void onOutOfMem(TileInfo tile) { - super.onOutOfMem(tile); - - fireLoadingFailed(tile, null); - } - - @Override - protected void onRetry(TileInfo tile, int triesLeft, Throwable error) { - super.onRetry(tile, triesLeft, error); - - fireLoadingRetry(tile); - } - - } - - /** - * @see DefaultTileFactory#createTileRunner(TileInfo) - */ - @Override - protected Runnable createTileRunner(TileInfo tile) { - fireLoadingStarted(tile); - return new StatusTileRunner(); - } - - /** - * @see DefaultTileFactory#cleanup() - */ - @Override - public void clearCache() { - super.clearCache(); - - fireReset(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/TileFactoryInfoMapServer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/TileFactoryInfoMapServer.java deleted file mode 100644 index bb41a27cde..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/TileFactoryInfoMapServer.java +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server; - -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileFactory; -import org.jdesktop.swingx.mapviewer.TileFactoryInfo; -import org.jdesktop.swingx.mapviewer.TileFactoryInfoTileProvider; - -/** - * TileFactoryInfoMapServer - * - * @author Simon Templer - * @version $Id$ - * @deprecated use {@link TileProviderMapServer} instead - */ -@Deprecated -public class TileFactoryInfoMapServer extends AbstractMapServer { - - private int minimumZoomLevel; - private int maximumZoomLevel; - private int totalMapZoom; - private int tileSize; - private boolean xr2l; - private boolean yt2b; - private String baseUrl; - private String xparam; - private String yparam; - private String zparam; - - private CustomTileFactory fact; - - /** - * @return the minimumZoomLevel - */ - public int getMinimumZoomLevel() { - return minimumZoomLevel; - } - - /** - * @param minimumZoomLevel the minimumZoomLevel to set - */ - public void setMinimumZoomLevel(int minimumZoomLevel) { - this.minimumZoomLevel = minimumZoomLevel; - } - - /** - * @return the maximumZoomLevel - */ - public int getMaximumZoomLevel() { - return maximumZoomLevel; - } - - /** - * @param maximumZoomLevel the maximumZoomLevel to set - */ - public void setMaximumZoomLevel(int maximumZoomLevel) { - this.maximumZoomLevel = maximumZoomLevel; - } - - /** - * @return the totalMapZoom - */ - public int getTotalMapZoom() { - return totalMapZoom; - } - - /** - * @param totalMapZoom the totalMapZoom to set - */ - public void setTotalMapZoom(int totalMapZoom) { - this.totalMapZoom = totalMapZoom; - } - - /** - * @return the tileSize - */ - public int getTileSize() { - return tileSize; - } - - /** - * @param tileSize the tileSize to set - */ - public void setTileSize(int tileSize) { - this.tileSize = tileSize; - } - - /** - * @return the xr2l - */ - public boolean isXr2l() { - return xr2l; - } - - /** - * @param xr2l the xr2l to set - */ - public void setXr2l(boolean xr2l) { - this.xr2l = xr2l; - } - - /** - * @return the yt2b - */ - public boolean isYt2b() { - return yt2b; - } - - /** - * @param yt2b the yt2b to set - */ - public void setYt2b(boolean yt2b) { - this.yt2b = yt2b; - } - - /** - * @return the baseUrl - */ - public String getBaseUrl() { - return baseUrl; - } - - /** - * @param baseUrl the baseUrl to set - */ - public void setBaseUrl(String baseUrl) { - this.baseUrl = baseUrl; - } - - /** - * @return the xparam - */ - public String getXparam() { - return xparam; - } - - /** - * @param xparam the xparam to set - */ - public void setXparam(String xparam) { - this.xparam = xparam; - } - - /** - * @return the yparam - */ - public String getYparam() { - return yparam; - } - - /** - * @param yparam the yparam to set - */ - public void setYparam(String yparam) { - this.yparam = yparam; - } - - /** - * @return the zparam - */ - public String getZparam() { - return zparam; - } - - /** - * @param zparam the zparam to set - */ - public void setZparam(String zparam) { - this.zparam = zparam; - } - - /** - * @see MapServer#getTileFactory(TileCache) - */ - @Override - public TileFactory getTileFactory(TileCache cache) { - TileFactoryInfo info = new TileFactoryInfo(minimumZoomLevel, maximumZoomLevel, totalMapZoom, - tileSize, xr2l, yt2b, xparam, yparam, zparam, baseUrl); - - fact = new CustomTileFactory( - new TileFactoryInfoTileProvider(info, GeotoolsConverter.getInstance()), cache); - return fact; - } - - /** - * @see MapServer#cleanup() - */ - @Override - public void cleanup() { - if (fact != null) - fact.cleanup(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/TileProviderMapServer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/TileProviderMapServer.java deleted file mode 100644 index dae9eab1ba..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/server/TileProviderMapServer.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.server; - -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileFactory; -import org.jdesktop.swingx.mapviewer.TileProvider; - -/** - * MapServer based on a TileProvider - * - * @author Simon Templer - * - * @version $Id$ - */ -public class TileProviderMapServer extends AbstractMapServer { - - private final TileProvider tileProvider; - - private TileFactory factory; - - /** - * Creates a MapServer based on a TileProvider - * - * @param tileProvider the TileProvider - */ - public TileProviderMapServer(TileProvider tileProvider) { - if (tileProvider == null) - throw new NullPointerException(); - - this.tileProvider = tileProvider; - } - - /** - * @see MapServer#cleanup() - */ - @Override - public void cleanup() { - if (factory != null) - factory.cleanup(); - } - - /** - * @see MapServer#getTileFactory(TileCache) - */ - @Override - public TileFactory getTileFactory(TileCache cache) { - factory = new CustomTileFactory(tileProvider, cache); - return factory; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tip/AbstractMapTip.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tip/AbstractMapTip.java deleted file mode 100644 index 929112a3d4..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tip/AbstractMapTip.java +++ /dev/null @@ -1,256 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.tip; - -import java.awt.Graphics2D; -import java.awt.MouseInfo; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.geom.Point2D; - -import javax.swing.BorderFactory; -import javax.swing.JLabel; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Color; -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.JXMapViewer; - -import de.fhg.igd.mapviewer.BasicMapKit; -import de.fhg.igd.mapviewer.MapPainter; - -/** - * Map tooltip - * - * @author Simon Templer - */ -public abstract class AbstractMapTip implements MapTip { - - /** - * Paints the tip layer - */ - private class MapTipPainter implements MapPainter { - - @Override - public void paint(Graphics2D g, JXMapViewer map, int width, int height) { - Rectangle viewPort = map.getViewportBounds(); - int x, y; - synchronized (AbstractMapTip.this) { - // decide if to paint - boolean paint = wantsToPaint(); - - if (paint) { - if (pos != null) { - try { - Point2D p = map.getTileFactory().getTileProvider().getConverter() - .geoToPixel(pos, map.getZoom()); - - // determine tip point - x = (int) p.getX() - viewPort.x; - y = (int) p.getY() - viewPort.y; - } catch (IllegalGeoPositionException e) { - // ignore - return; - } - } - else { - Point mousePos = MouseInfo.getPointerInfo().getLocation(); - Point mapPos = map.getLocationOnScreen(); - x = mousePos.x - mapPos.x; - y = mousePos.y - mapPos.y; - } - } - else { - return; - } - } - - // determine paint position - Point pos = position(x, y, tip.getHeight(), tip.getWidth(), viewPort.width, - viewPort.height); - - // paint label - g.translate(pos.x, pos.y); - tip.paint(g); - g.translate(-pos.x, -pos.y); - } - - @Override - public String getTipText(Point point) { - return null; - } - - @Override - public void setMapKit(BasicMapKit mapKit) { - // ignore - } - - @Override - public void dispose() { - AbstractMapTip.this.dispose(); - } - - } - - private JXMapViewer map; - - private final JLabel tip = new JLabel(); - - private GeoPosition pos = null; - - private MapTipPainter painter; - - /** - * @see MapTip#init(JXMapViewer) - */ - @Override - public void init(JXMapViewer map) { - this.map = map; - - configureTipLabel(tip); - } - - /** - * Dispose the map tip - */ - protected void dispose() { - // do nothing - } - - /** - * Get the associated map - * - * @return the associated map - */ - protected JXMapViewer getMap() { - return map; - } - - /** - * Configure the label used to paint the tip - * - * @param tip the label used to paint the tip - */ - protected void configureTipLabel(JLabel tip) { - Color foreground = PlatformUI.getWorkbench().getDisplay() - .getSystemColor(SWT.COLOR_INFO_FOREGROUND); - Color background = PlatformUI.getWorkbench().getDisplay() - .getSystemColor(SWT.COLOR_INFO_BACKGROUND); - java.awt.Color fgColor = new java.awt.Color(foreground.getRed(), foreground.getGreen(), - foreground.getBlue()); - tip.setForeground(fgColor); - tip.setBackground(new java.awt.Color(background.getRed(), background.getGreen(), - background.getBlue())); - - tip.setOpaque(true); - tip.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createLineBorder(fgColor, 1), - BorderFactory.createEmptyBorder(1, 1, 1, 1))); - } - - /** - * Position the tip before painting. This implementation paints the tip - * above the position. Override to change that behavior. - * - * @param x the x ordinate of the paint position - * @param y the y ordinate of the paint position - * @param tipHeight the tip height - * @param tipWidth the tip width - * @param viewWidth the viewport width - * @param viewHeight the viewport height - * - * @return the paint position for the tip - */ - protected Point position(int x, int y, int tipHeight, int tipWidth, int viewWidth, - int viewHeight) { - y -= tip.getHeight(); // above cursor - - return new Point(x, y); - } - - /** - * @see MapTip#getLastText() - */ - @Override - public String getLastText() { - return tip.getText(); - } - - /** - * @see MapTip#getPainter() - */ - @Override - public MapPainter getPainter() { - if (painter == null) { - painter = new MapTipPainter(); - } - - return painter; - } - - /** - * @see MapTip#wantsToPaint() - */ - @Override - public boolean wantsToPaint() { - synchronized (this) { - // check tip text - boolean paint = tip.getText() != null && !tip.getText().isEmpty(); - // check position - paint = paint && (pos != null || useMousePos()); - - return paint; - } - } - - /** - * Get if the mouse position shall be used as the tip position if no - * {@link GeoPosition} is specified - * - * @return if the mouse position shall be used as tip position if no - * position is given - */ - protected boolean useMousePos() { - return false; - } - - /** - * Set the tip text - * - * @param text the tip text - * @param pos the tip position - */ - public void setTipText(String text, GeoPosition pos) { - synchronized (this) { - tip.setText(text); - tip.setSize(tip.getPreferredSize()); - this.pos = pos; - } - - if (map != null) { - map.repaint(); - } - } - - /** - * Clear the tip - */ - public void clearTip() { - setTipText(null, null); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tip/HoverMapTip.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tip/HoverMapTip.java deleted file mode 100644 index 04cb7c1601..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tip/HoverMapTip.java +++ /dev/null @@ -1,192 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.tip; - -import java.awt.MouseInfo; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; - -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.JXMapViewer; -import org.jdesktop.swingx.mapviewer.PixelConverter; - -/** - * Map tooltip - * - * @author Simon Templer - */ -public abstract class HoverMapTip extends AbstractMapTip { - - private static final int HOVER_DELAY = 400; - - private final ScheduledExecutorService scheduleService = Executors.newScheduledThreadPool(2); - - private ScheduledFuture hoverTimer = null; - - private ScheduledFuture closeTimer = null; - - /** - * If the tip shall be hidden on mouse move - */ - private boolean hideOnMouseMove = true; - - /** - * Initialize the map tip with the given map - * - * @param map the map - */ - @Override - public void init(JXMapViewer map) { - super.init(map); - - MouseAdapter mouse = new MouseAdapter() { - - @Override - public void mouseEntered(MouseEvent e) { - mouseMoved(e); - } - - @Override - public void mouseExited(MouseEvent e) { - if (hoverTimer != null) { - hoverTimer.cancel(true); - // XXX on Windows this occurs when showing the tooltip - - // hideToolTip(); - } - } - - @Override - public void mouseDragged(MouseEvent e) { - hideTip(); - } - - @Override - public void mouseMoved(final MouseEvent e) { - // cancel old task - if (hoverTimer != null) { - hoverTimer.cancel(true); - } - - if (hideOnMouseMove) { - hideTip(); - } - - if (true) { // start hover timer - // start new one - hoverTimer = scheduleService.schedule(new Runnable() { - - @Override - public void run() { - // test if mouse was moved - Point evt = new Point(e.getXOnScreen(), e.getYOnScreen()); - Point pos = MouseInfo.getPointerInfo().getLocation(); - if (evt.equals(pos)) { - String text = getTipText(e.getX(), e.getY(), - getMap().getTileFactory().getTileProvider().getConverter(), - getMap().getZoom()); - - if (text != null) { - showTip(e, text); - } - } - } - }, HOVER_DELAY, TimeUnit.MILLISECONDS); - } - } - }; - - map.addMouseListener(mouse); - map.addMouseMotionListener(mouse); - } - - /** - * @see AbstractMapTip#wantsToPaint() - */ - @Override - public boolean wantsToPaint() { - synchronized (this) { - return super.wantsToPaint() && closeTimer != null; - } - } - - /** - * Get the tip text for the given position - * - * @param x the x viewport pixel ordinate - * @param y the y viewport pixel ordinate - * @param converter the converter - * @param zoom the zoom level - * @return the tip text, null for no tip - */ - protected abstract String getTipText(int x, int y, PixelConverter converter, int zoom); - - private void showTip(final MouseEvent e, final String text) { - synchronized (HoverMapTip.this) { - PixelConverter converter = getMap().getTileFactory().getTileProvider().getConverter(); - int zoom = getMap().getZoom(); - Rectangle viewPort = getMap().getViewportBounds(); - GeoPosition pos = converter - .pixelToGeo(new Point(viewPort.x + e.getX(), viewPort.y + e.getY()), zoom); - - setTipText(text, pos); - - if (closeTimer != null) { - closeTimer.cancel(true); - } - - closeTimer = scheduleService.scheduleAtFixedRate(new Runnable() { - - @Override - public void run() { - hideTip(); - } - }, 5 * HOVER_DELAY, 1000, TimeUnit.MILLISECONDS); - } - } - - private void hideTip() { - synchronized (HoverMapTip.this) { - if (closeTimer != null) { - closeTimer.cancel(true); - closeTimer = null; - } - clearTip(); - } - } - - /** - * @return if the tip shall be hidden on mouse move - */ - public boolean isHideOnMouseMove() { - return hideOnMouseMove; - } - - /** - * Set if the tip shall be hidden on mouse move - * - * @param hideOnMouseMove if the tip shall be hidden on mouse move - */ - public void setHideOnMouseMove(boolean hideOnMouseMove) { - this.hideOnMouseMove = hideOnMouseMove; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tip/MapTip.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tip/MapTip.java deleted file mode 100644 index 573447b536..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tip/MapTip.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.tip; - -import org.jdesktop.swingx.mapviewer.JXMapViewer; - -import de.fhg.igd.mapviewer.BasicMapKit; -import de.fhg.igd.mapviewer.MapPainter; - -/** - * Map tip interface - * - * @author Simon Templer - */ -public interface MapTip { - - /** - * Get the last tip text - * - * @return the last tip text - */ - public abstract String getLastText(); - - /** - * Get the tip painter for use in a {@link MapTipManager} or - * {@link BasicMapKit} - * - * @return the tip painter - */ - public abstract MapPainter getPainter(); - - /** - * Determines if the tip wants to paint something - * - * @return if the tip wants to paint - */ - public abstract boolean wantsToPaint(); - - /** - * Initialize the map tip with the given map - * - * @param map the map - */ - void init(JXMapViewer map); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tip/MapTipManager.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tip/MapTipManager.java deleted file mode 100644 index 0a833ad46d..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tip/MapTipManager.java +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.tip; - -import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.Toolkit; -import java.awt.datatransfer.Clipboard; -import java.awt.datatransfer.ClipboardOwner; -import java.awt.datatransfer.StringSelection; -import java.awt.datatransfer.Transferable; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.jdesktop.swingx.mapviewer.JXMapViewer; -import org.jdesktop.swingx.painter.Painter; - -import de.fhg.igd.mapviewer.BasicMapKit; -import de.fhg.igd.mapviewer.MapPainter; - -/** - * Manages multiple map tips to assure only the one with the highest priority is - * painted. - * - * @author Simon Templer - */ -public class MapTipManager implements MapPainter, ClipboardOwner { - - /** - * Map tip container - */ - private static class MapTipContainer implements Comparable { - - private final MapTip mapTip; - - private final int priority; - - /** - * Create a map tip container - * - * @param mapTip the map tip - * @param priority the tip priority - */ - public MapTipContainer(MapTip mapTip, int priority) { - super(); - this.mapTip = mapTip; - this.priority = priority; - } - - /** - * @return the map tip - */ - public MapTip getMapTip() { - return mapTip; - } - - /** - * @see Comparable#compareTo(Object) - */ - @Override - public int compareTo(MapTipContainer other) { - if (priority < other.priority) { - return 1; - } - else if (other.priority < priority) { - return -1; - } - else { - return mapTip.toString().compareTo(other.mapTip.toString()); - } - } - - /** - * @see Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((mapTip == null) ? 0 : mapTip.hashCode()); - return result; - } - - /** - * @see Object#equals(Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - MapTipContainer other = (MapTipContainer) obj; - if (mapTip == null) { - if (other.mapTip != null) - return false; - } - else if (!mapTip.equals(other.mapTip)) - return false; - return true; - } - - } - - private SortedSet mapTips = new TreeSet(); - - private MapTip lastTip = null; - - private BasicMapKit mapKit = null; - - /** - * Add a map tip to the manager - * - * @param tip the map tip - * @param priority the map tip's priority (map tips with a higher priority - * will be preferred for painting) - */ - public void addMapTip(MapTip tip, int priority) { - mapTips.add(new MapTipContainer(tip, priority)); - if (mapKit != null) { - tip.getPainter().setMapKit(mapKit); - } - } - - /** - * @see Painter#paint(Graphics2D, Object, int, int) - */ - @Override - public void paint(Graphics2D g, JXMapViewer object, int width, int height) { - for (MapTipContainer c : mapTips) { - if (c.getMapTip().wantsToPaint()) { - synchronized (this) { - c.getMapTip().getPainter().paint(g, object, width, height); - lastTip = c.getMapTip(); - } - return; - } - } - } - - /** - * @see MapPainter#setMapKit(BasicMapKit) - */ - @Override - public void setMapKit(BasicMapKit mapKit) { - this.mapKit = mapKit; - - for (MapTipContainer c : mapTips) { - c.getMapTip().init(mapKit.getMainMap()); - c.getMapTip().getPainter().setMapKit(mapKit); - } - - mapKit.getMainMap().addKeyListener(new KeyAdapter() { - - @Override - public void keyPressed(KeyEvent e) { - synchronized (this) { - if (lastTip != null && e.getKeyChar() == 'c') { - String text = lastTip.getLastText(); - if (text != null) { - StringSelection stringSelection = new StringSelection(text); - Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); - clipboard.setContents(stringSelection, MapTipManager.this); - } - } - } - } - }); - } - - /** - * @see MapPainter#getTipText(Point) - */ - @Override - public String getTipText(Point point) { - return null; - } - - /** - * @see MapPainter#dispose() - */ - @Override - public void dispose() { - for (MapTipContainer c : mapTips) { - c.getMapTip().getPainter().dispose(); - } - } - - /** - * @see ClipboardOwner#lostOwnership(Clipboard, Transferable) - */ - @Override - public void lostOwnership(Clipboard clipboard, Transferable contents) { - // ignore - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/AbstractMapTool.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/AbstractMapTool.java deleted file mode 100644 index 766698a7c2..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/AbstractMapTool.java +++ /dev/null @@ -1,391 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.tools; - -import java.awt.Cursor; -import java.awt.event.MouseEvent; -import java.awt.geom.Point2D; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; - -import de.fhg.igd.mapviewer.BasicMapKit; -import de.fhg.igd.mapviewer.MapTool; -import de.fhg.igd.mapviewer.MapToolRenderer; -import de.fhg.igd.mapviewer.view.arecalculation.AreaCalc; - -/** - * AbstractMapTool - * - * @author Simon Templer - * - * @version $Id$ - */ -public abstract class AbstractMapTool implements MapTool, Comparable { - - /** - * ActivationListener - */ - public static interface ActivationListener { - - /** - * Called when the activation state of the tool has changed - * - * @param tool the tool that was activated/deactivated - * @param active the new state of the tool - */ - public void activated(AbstractMapTool tool, boolean active); - - } - - private final List positions = new ArrayList(); - - private final Set listeners = new HashSet(); - - private MapToolRenderer renderer; - - private boolean active = false; - - private Activator activator; - - /** - * The map kit - */ - protected BasicMapKit mapKit; - - private URL iconURL; - private String name; - private String description; - - private String id; - - private int priority = 0; - - private boolean lastPressedPopupTrigger = false; - private boolean lastReleasedPopupTrigger = false; - - /** - * Set the map kit - * - * @param mapKit the map kit to set - */ - public void setMapKit(BasicMapKit mapKit) { - this.mapKit = mapKit; - } - - /** - * @return the iconURL - */ - @Override - public URL getIconURL() { - return iconURL; - } - - /** - * @param iconURL the iconURL to set - */ - public void setIconURL(URL iconURL) { - this.iconURL = iconURL; - } - - /** - * @return the name - */ - @Override - public String getName() { - return name; - } - - /** - * @param name the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @return the description - */ - @Override - public String getDescription() { - return description; - } - - /** - * @param description the description to set - */ - public void setDescription(String description) { - this.description = description; - } - - /** - * @return the id - */ - @Override - public String getId() { - return id; - } - - /** - * @param id the id to set - */ - public void setId(String id) { - this.id = id; - } - - /** - * @see MapTool#getPositions() - */ - @Override - public List getPositions() { - return positions; - } - - /** - * Get the positions as pixel coordinates - * - * @return the pixel coordinates - * - * @throws IllegalGeoPositionException if a conversion fails - */ - public List getPoints() throws IllegalGeoPositionException { - List points = new ArrayList(); - - for (GeoPosition pos : positions) { - points.add(mapKit.getMainMap().convertGeoPositionToPoint(pos)); - } - - return points; - } - - /** - * @see MapTool#getRenderer() - */ - @Override - public MapToolRenderer getRenderer() { - return renderer; - } - - /** - * Sets the renderer for this tool - * - * @param renderer the renderer - */ - public void setRenderer(MapToolRenderer renderer) { - this.renderer = renderer; - } - - /** - * Add a position - * - * @param pos the position to add - */ - protected void addPosition(GeoPosition pos) { - positions.add(pos); - repaint(); - - // notify AreaCalc - AreaCalc.getInstance().setGeoPositions(this.positions); - } - - /** - * Remove the last position that was added - */ - protected void removeLastPosition() { - if (positions.size() > 0) { - positions.remove(positions.size() - 1); - repaint(); - } - } - - /** - * @see MapTool#reset() - */ - @Override - public void reset() { - positions.clear(); - repaint(); - } - - /** - * Triggers a repaint of the map - */ - protected void repaint() { - mapKit.getMainMap().repaint(); - } - - /** - * Set the {@link Activator} that selects the Tool in its map environment - * - * @param activator the activator to set - */ - public void setActivator(Activator activator) { - this.activator = activator; - } - - /** - * Activate the tool - */ - public void activate() { - activator.activate(); - } - - /** - * @see MapTool#getCursor() - */ - @Override - public Cursor getCursor() { - return Cursor.getDefaultCursor(); - } - - /** - * @see MapTool#setActive(boolean) - */ - @Override - public void setActive(boolean active) { - this.active = active; - - if (active) { - activate(); - } - - for (ActivationListener listener : listeners) { - listener.activated(this, active); - } - } - - /** - * @return if the tool is active - */ - public boolean isActive() { - return active; - } - - /** - * Adds an {@link ActivationListener} - * - * @param listener the listener to add - */ - public void addActivationListener(ActivationListener listener) { - listeners.add(listener); - } - - /** - * Removes an {@link ActivationListener} - * - * @param listener the listener to remove - */ - public void removeActivationListener(ActivationListener listener) { - listeners.remove(listener); - } - - /** - * Called when a popup event occurs - * - * @param me the mouse event - * @param pos the geo position - */ - protected abstract void popup(MouseEvent me, GeoPosition pos); - - /** - * Called when a mouse button was clicked that was no popup trigger - * - * @param me the mouse event - * @param pos the geo position - */ - protected abstract void click(MouseEvent me, GeoPosition pos); - - /** - * Called when a mouse button was pressed - * - * @param me the mouse event - * @param pos the geo position - */ - protected abstract void pressed(MouseEvent me, GeoPosition pos); - - /** - * Called when a mouse button was released - * - * @param me the mouse event - * @param pos the geo position - */ - protected abstract void released(MouseEvent me, GeoPosition pos); - - /** - * @see MapTool#mouseClicked(MouseEvent, GeoPosition) - */ - @Override - public void mouseClicked(MouseEvent me, GeoPosition pos) { - if (!me.isPopupTrigger() && !lastPressedPopupTrigger && !lastReleasedPopupTrigger) { - click(me, pos); - } - } - - /** - * @see MapTool#mousePressed(MouseEvent, GeoPosition) - */ - @Override - public void mousePressed(MouseEvent me, GeoPosition pos) { - if (me.isPopupTrigger()) { - popup(me, pos); - lastPressedPopupTrigger = true; - } - else { - pressed(me, pos); - lastPressedPopupTrigger = false; - } - } - - /** - * @see MapTool#mouseReleased(MouseEvent, GeoPosition) - */ - @Override - public void mouseReleased(MouseEvent me, GeoPosition pos) { - if (me.isPopupTrigger()) { - popup(me, pos); - lastReleasedPopupTrigger = true; - } - else { - released(me, pos); - lastReleasedPopupTrigger = false; - } - } - - /** - * @see Comparable#compareTo(Object) - */ - @Override - public int compareTo(AbstractMapTool other) { - if (priority > other.priority) - return -1; - else if (priority < other.priority) - return 1; - else - return getId().compareTo(other.getId()); - } - - /** - * @param priority the priority to set - */ - public void setPriority(int priority) { - this.priority = priority; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/AbstractMapTool.properties b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/AbstractMapTool.properties deleted file mode 100644 index 9b03bf023e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/AbstractMapTool.properties +++ /dev/null @@ -1,25 +0,0 @@ -# AbstractMapTool - -PointerTool.name= -PointerTool.description=

Pointer
Left click: Select an object
Strg+Click: Select or unselect an object
Double click: Center on this position and zoom in by one level
Right click: Options for the current pointer position

-PointerTool.icon=pointer.png - -SceneTool.name= -SceneTool.description=

Pointer
Left click: Select an object
Double click: Center on this position and zoom in by one level

-SceneTool.icon=pointer.png - -NoTool.name= -NoTool.description=

Pointer
Double click: Center on a position and zoom in one level

-NoTool.icon=pointer.png - -BoxZoomTool.name= -BoxZoomTool.description=

Draw a rectangle and zoom in
Left click: Set a corner of the rectangle
Right click: Cancel

-BoxZoomTool.icon=zoom2.png - -PointTool.name= -PointTool.description=

Select a position
Left click: Select a position
Right click: Options for the selected position

-PointTool.icon=x.gif - -PolygonTool.name= -PolygonTool.description=

Draw a polygon
Left click: Add a position to the polygon or begin a new one
Alt+Click: Remove the last position from the polygon
Double click: Complete the polygon
Right click: Options for the completed polygon

-PolygonTool.icon=poly.png \ No newline at end of file diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/AbstractMapTool_de.properties b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/AbstractMapTool_de.properties deleted file mode 100644 index df03a818b1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/AbstractMapTool_de.properties +++ /dev/null @@ -1,19 +0,0 @@ -# AbstractMapTool (de) - -PointerTool.name= -PointerTool.description=

Auswahl
Linksklick: Auswählen eines Objekts
Strg+Klick: Aus- oder Abwählen eines Objekts
Doppelklick: Zentrieren und eine Stufe an den Punkt heranzoomen
Rechtsklick: Optionen an der Zeigerposition

- -SceneTool.name= -SceneTool.description=

Auswahl
Linksklick: Auswählen eines Objekts
Strg+Klick: Weitere Objekte auswählen
Alt+Klick: Auswahlrahmen aufspannen
Doppelklick: Zentrieren und eine Stufe an den Punkt heranzoomen

- -NoTool.name= -NoTool.description=

Zeiger
Doppelklick: Zentrieren und eine Stufe heranzoomen

- -BoxZoomTool.name= -BoxZoomTool.description=

Rechteck aufspannen und zoomen
Linksklick: Ecke des Rechtecks bestimmen
Rechtsklick: Abbrechen

- -PointTool.name= -PointTool.description=

Das X markiert den Punkt
Linksklick: Punkt auswählen
Rechtsklick: Optionen zum gewählten Punkt

- -PolygonTool.name= -PolygonTool.description=

Markieren eines Polygons
Linksklick: Punkt hinzufügen oder neues Polygon beginnen
Alt+Klick: Letzten Punkt entfernen
Doppelklick: Polygon abschliessen
Rechtsklick: Optionen zum abgeschlossenen Polygon

\ No newline at end of file diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/Activator.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/Activator.java deleted file mode 100644 index 9921d5c365..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/Activator.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.tools; - -/** - * Activator - * - * @author Simon Templer - * - * @version $Id$ - */ -public interface Activator { - - /** - * Perform activation - */ - public void activate(); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/renderer/BoxRenderer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/renderer/BoxRenderer.java deleted file mode 100644 index c3a4d5a97d..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/renderer/BoxRenderer.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.tools.renderer; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.geom.Point2D; -import java.util.List; - -import de.fhg.igd.mapviewer.MapTool; -import de.fhg.igd.mapviewer.MapToolRenderer; - -/** - * BoxRenderer - * - * @author Simon Templer - * - * @version $Id$ - */ -public class BoxRenderer implements MapToolRenderer { - - private Color backColor = new Color(255, 0, 0, 100); - - private Color borderColor = Color.RED; - - /** - * @see MapToolRenderer#paint(Graphics2D, List, Point2D, MapTool) - */ - @Override - public void paint(final Graphics2D g, final List points, final Point2D mousePos, - final MapTool tool) { - if (points.size() < 1 || (points.size() < 2 && mousePos == null)) - return; - - // draw a box - Point2D p1 = points.get(0); - - Point2D p2; - if (points.size() > 1) - p2 = points.get(1); - else - p2 = mousePos; - - int x, y, width, height; - - if (p1.getX() < p2.getX()) { - x = (int) p1.getX(); - width = (int) p2.getX() - (int) p1.getX(); - } - else { - x = (int) p2.getX(); - width = (int) p1.getX() - (int) p2.getX(); - } - - if (p1.getY() < p2.getY()) { - y = (int) p1.getY(); - height = (int) p2.getY() - (int) p1.getY(); - } - else { - y = (int) p2.getY(); - height = (int) p1.getY() - (int) p2.getY(); - } - - Rectangle box = new Rectangle(x, y, width, height); - - g.setColor(backColor); - g.fill(box); - g.setColor(borderColor); - g.draw(box); - } - - /** - * @see MapToolRenderer#repaintOnMouseMove() - */ - @Override - public boolean repaintOnMouseMove() { - return true; - } - - /** - * @return the backColor - */ - public Color getBackColor() { - return backColor; - } - - /** - * @param backColor the backColor to set - */ - public void setBackColor(Color backColor) { - this.backColor = backColor; - } - - /** - * @return the borderColor - */ - public Color getBorderColor() { - return borderColor; - } - - /** - * @param borderColor the borderColor to set - */ - public void setBorderColor(Color borderColor) { - this.borderColor = borderColor; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/renderer/LineRenderer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/renderer/LineRenderer.java deleted file mode 100644 index 5206b07c6e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/renderer/LineRenderer.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.tools.renderer; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.geom.Point2D; -import java.util.List; - -import de.fhg.igd.mapviewer.MapTool; -import de.fhg.igd.mapviewer.MapToolRenderer; - -/** - * PolygonRenderer - * - * @author Simon Templer - * - * @version $Id$ - */ -public class LineRenderer implements MapToolRenderer { - - private Color borderColor = Color.RED; - - private boolean drawMousePos = true; - - /** - * @see MapToolRenderer#paint(Graphics2D, List, Point2D, MapTool) - */ - @Override - public void paint(Graphics2D g, List points, Point2D mousePos, MapTool tool) { - if (drawMousePos && mousePos != null) - points.add(mousePos); - - int count = points.size(); - - if (count > 0) { - int[] x = new int[count]; - int[] y = new int[count]; - - int index = 0; - for (Point2D point : points) { - x[index] = (int) point.getX(); - y[index] = (int) point.getY(); - - index++; - } - - g.setColor(borderColor); - g.drawPolyline(x, y, count); - } - } - - /** - * @see MapToolRenderer#repaintOnMouseMove() - */ - @Override - public boolean repaintOnMouseMove() { - return drawMousePos; - } - - /** - * @return the borderColor - */ - public Color getBorderColor() { - return borderColor; - } - - /** - * @param borderColor the borderColor to set - */ - public void setBorderColor(Color borderColor) { - this.borderColor = borderColor; - } - - /** - * @param drawMousePos the drawMousePos to set - */ - public void setDrawMousePos(boolean drawMousePos) { - this.drawMousePos = drawMousePos; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/renderer/PolygonRenderer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/renderer/PolygonRenderer.java deleted file mode 100644 index bf13c249a8..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/renderer/PolygonRenderer.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.tools.renderer; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Polygon; -import java.awt.geom.Point2D; -import java.util.List; - -import de.fhg.igd.mapviewer.MapTool; -import de.fhg.igd.mapviewer.MapToolRenderer; - -/** - * PolygonRenderer - * - * @author Simon Templer - * - * @version $Id$ - */ -public class PolygonRenderer implements MapToolRenderer { - - private Color backColor = new Color(255, 0, 0, 100); - - private Color borderColor = Color.RED; - - private boolean drawMousePos = true; - - /** - * @see MapToolRenderer#paint(Graphics2D, List, Point2D, MapTool) - */ - @Override - public void paint(Graphics2D g, List points, Point2D mousePos, MapTool tool) { - if (drawMousePos && mousePos != null) - points.add(mousePos); - - int count = points.size(); - - if (count > 0) { - int[] x = new int[count]; - int[] y = new int[count]; - - int index = 0; - for (Point2D point : points) { - x[index] = (int) point.getX(); - y[index] = (int) point.getY(); - - index++; - } - - Polygon polygon = new Polygon(x, y, count); - - g.setColor(backColor); - g.fill(polygon); - g.setColor(borderColor); - g.draw(polygon); - } - } - - /** - * @see MapToolRenderer#repaintOnMouseMove() - */ - @Override - public boolean repaintOnMouseMove() { - return true; - } - - /** - * @return the backColor - */ - public Color getBackColor() { - return backColor; - } - - /** - * @param backColor the backColor to set - */ - public void setBackColor(Color backColor) { - this.backColor = backColor; - } - - /** - * @return the borderColor - */ - public Color getBorderColor() { - return borderColor; - } - - /** - * @param borderColor the borderColor to set - */ - public void setBorderColor(Color borderColor) { - this.borderColor = borderColor; - } - - /** - * @param drawMousePos the drawMousePos to set - */ - public void setDrawMousePos(boolean drawMousePos) { - this.drawMousePos = drawMousePos; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/renderer/XPointRenderer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/renderer/XPointRenderer.java deleted file mode 100644 index 74a4c87eeb..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/tools/renderer/XPointRenderer.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.tools.renderer; - -import java.awt.BasicStroke; -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.geom.Point2D; -import java.util.List; - -import de.fhg.igd.mapviewer.MapTool; -import de.fhg.igd.mapviewer.MapToolRenderer; - -/** - * XPointRenderer - * - * @author Simon Templer - * - * @version $Id$ - */ -public class XPointRenderer implements MapToolRenderer { - - private Color color = Color.RED; - private int xSize = 10; - private int lineStrength = 3; - - /** - * @see MapToolRenderer#paint(Graphics2D, List, Point2D, MapTool) - */ - @Override - public void paint(Graphics2D g, List points, Point2D mousePos, MapTool tool) { - if (!points.isEmpty()) { - Graphics2D g2 = (Graphics2D) g.create(); - g2.translate((int) points.get(0).getX(), (int) points.get(0).getY()); - - g2.setColor(color); - g2.setStroke( - new BasicStroke(lineStrength, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND)); - g2.drawLine(-xSize / 2, -xSize / 2, xSize / 2, xSize / 2); - g2.drawLine(-xSize / 2, xSize / 2, xSize / 2, -xSize / 2); - } - } - - /** - * @see MapToolRenderer#repaintOnMouseMove() - */ - @Override - public boolean repaintOnMouseMove() { - return false; - } - - /** - * @return the color - */ - public Color getColor() { - return color; - } - - /** - * @param color the color to set - */ - public void setColor(Color color) { - this.color = color; - } - - /** - * @return the xSize - */ - public int getxSize() { - return xSize; - } - - /** - * @param xSize the xSize to set - */ - public void setxSize(int xSize) { - this.xSize = xSize; - } - - /** - * @return the lineStrength - */ - public int getLineStrength() { - return lineStrength; - } - - /** - * @param lineStrength the lineStrength to set - */ - public void setLineStrength(int lineStrength) { - this.lineStrength = lineStrength; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/AbstractMapView.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/AbstractMapView.java deleted file mode 100644 index ae29a0368b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/AbstractMapView.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view; - -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.part.ViewPart; -import org.eclipse.ui.part.WorkbenchPart; - -import de.fhg.igd.mapviewer.view.PositionStatus.EpsgProvider; - -/** - * Abstract map view - * - * @author Andreas Stein - */ -public abstract class AbstractMapView extends ViewPart { - - private final SelectionProviderFacade selectionProvider = new SelectionProviderFacade(); - - /** - * The EPSG code provider - */ - protected EpsgProvider epsgProvider = new EpsgProvider() { - - @Override - public int getEpsgCode() { - // default: use map CRS - return 0; - } - }; - - /** - * Set the selection provider - * - * @param prov the selection provider to set - */ - public void setSelectionProvider(ISelectionProvider prov) { - selectionProvider.setSelectionProvider(prov); - } - - /** - * @see WorkbenchPart#createPartControl(Composite) - */ - @Override - public void createPartControl(Composite parent) { - getSite().setSelectionProvider(selectionProvider); - } - - /** - * @return the epsgProvider - */ - public EpsgProvider getEpsgProvider() { - return epsgProvider; - } - - /** - * @param epsgProvider the epsgProvider to set - */ - public void setEpsgProvider(EpsgProvider epsgProvider) { - this.epsgProvider = epsgProvider; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/ExtendedMapKit.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/ExtendedMapKit.java deleted file mode 100644 index bccd9e7ab5..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/ExtendedMapKit.java +++ /dev/null @@ -1,275 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view; - -import java.awt.Point; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.ui.IMemento; -import org.eclipse.ui.IPersistable; -import org.eclipse.ui.IPersistableEditor; -import org.eclipse.ui.ISelectionListener; -import org.eclipse.ui.ISelectionService; -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; - -import de.fhg.igd.eclipse.util.extension.exclusive.ExclusiveExtension.ExclusiveExtensionListener; -import de.fhg.igd.eclipse.util.extension.selective.SelectiveExtension.SelectiveExtensionListener; -import de.fhg.igd.mapviewer.BasicMapKit; -import de.fhg.igd.mapviewer.MapKitTileOverlayPainter; -import de.fhg.igd.mapviewer.MapPainter; -import de.fhg.igd.mapviewer.MapTool; -import de.fhg.igd.mapviewer.server.MapServer; -import de.fhg.igd.mapviewer.server.MapServerFactory; -import de.fhg.igd.mapviewer.view.cache.ITileCacheFactory; -import de.fhg.igd.mapviewer.view.cache.ITileCacheService; -import de.fhg.igd.mapviewer.view.overlay.IMapPainterService; -import de.fhg.igd.mapviewer.view.overlay.ITileOverlayService; -import de.fhg.igd.mapviewer.view.overlay.MapPainterFactory; -import de.fhg.igd.mapviewer.view.overlay.TileOverlayFactory; -import de.fhg.igd.mapviewer.view.server.IMapServerService; - -/** - * Map kit that stores its state in an {@link IMemento} and uses the - * {@link IMapPainterService} and {@link ITileOverlayService} to determine the - * active overlays. - * - * @author Simon Templer - */ -public class ExtendedMapKit extends BasicMapKit implements IPersistableEditor { - - private static final String MEMENTO_KEY_MAX_Y = "max_y"; //$NON-NLS-1$ - private static final String MEMENTO_KEY_MAX_X = "max_x"; //$NON-NLS-1$ - private static final String MEMENTO_KEY_MIN_Y = "min_y"; //$NON-NLS-1$ - private static final String MEMENTO_KEY_MIN_X = "min_x"; //$NON-NLS-1$ - private static final String MEMENTO_KEY_EPSG = "epsg"; //$NON-NLS-1$ - - private static final long serialVersionUID = -764275511553180773L; - - private static final Log log = LogFactory.getLog(ExtendedMapKit.class); - - private final AbstractMapView view; - - /** - * Constructor - * - * @param view the map view - */ - public ExtendedMapKit(final AbstractMapView view) { - super(getCache()); - - this.view = view; - - // tile cache - ITileCacheService cacheService = PlatformUI.getWorkbench() - .getService(ITileCacheService.class); - cacheService.addListener(new ExclusiveExtensionListener() { - - @Override - public void currentObjectChanged(TileCache current, ITileCacheFactory definition) { - setTileCache(current); - } - - }); - - // map painters - IMapPainterService mapPainters = PlatformUI.getWorkbench() - .getService(IMapPainterService.class); - List painterList = new ArrayList(); - for (MapPainter mapPainter : mapPainters.getActiveObjects()) { - painterList.add(mapPainter); - } - setCustomPainters(painterList); - - mapPainters.addListener(new SelectiveExtensionListener() { - - @Override - public void deactivated(MapPainter object, MapPainterFactory definition) { - removeCustomPainter(object); - } - - @Override - public void activated(MapPainter object, MapPainterFactory definition) { - addCustomPainter(object); - } - }); - - // tile overlays - ITileOverlayService tileOverlays = PlatformUI.getWorkbench() - .getService(ITileOverlayService.class); - SortedSet mainOverlays = new TreeSet(); - SortedSet miniOverlays = new TreeSet(); - for (TileOverlayPainter tileOverlay : tileOverlays.getActiveObjects()) { - if (tileOverlay instanceof MapKitTileOverlayPainter) { - ((MapKitTileOverlayPainter) tileOverlay).setMapKit(this); - } - - mainOverlays.add(tileOverlay); - - if (tileOverlays.getDefinition(tileOverlay).showInMiniMap()) { - miniOverlays.add(tileOverlay); - } - } - getMainMap().setTileOverlays(mainOverlays); - getMiniMap().setTileOverlays(miniOverlays); - - tileOverlays.addListener( - new SelectiveExtensionListener() { - - @Override - public void deactivated(TileOverlayPainter object, - TileOverlayFactory definition) { - getMainMap().removeTileOverlay(object); - if (definition.showInMiniMap()) { - getMiniMap().removeTileOverlay(object); - } - } - - @Override - public void activated(TileOverlayPainter object, - TileOverlayFactory definition) { - if (object instanceof MapKitTileOverlayPainter) { - ((MapKitTileOverlayPainter) object).setMapKit(ExtendedMapKit.this); - } - - getMainMap().addTileOverlay(object); - if (definition.showInMiniMap()) { - getMiniMap().addTileOverlay(object); - } - } - }); - - // map server - IMapServerService mapServers = PlatformUI.getWorkbench() - .getService(IMapServerService.class); - setServer(mapServers.getCurrent(), true); - - mapServers.addListener(new ExclusiveExtensionListener() { - - @Override - public void currentObjectChanged(MapServer current, MapServerFactory definition) { - setServer(current, false); - } - }); - } - - /** - * Get the current tile cache - * - * @return the current tile cache - */ - private static TileCache getCache() { - ITileCacheService cacheService = PlatformUI.getWorkbench() - .getService(ITileCacheService.class); - return cacheService.getCurrent(); - } - - /** - * @see BasicMapKit#setMapTool(MapTool) - */ - @Override - public void setMapTool(MapTool tool) { - ISelectionService service = PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getSelectionService(); - - MapTool oldTool = getMapTool(); - if (oldTool != null && oldTool instanceof ISelectionListener) { - service.removeSelectionListener((ISelectionListener) oldTool); - } - - super.setMapTool(tool); - - if (tool instanceof ISelectionListener) { - service.addSelectionListener((ISelectionListener) tool); - } - - // set the tool as selection provider - if (tool instanceof ISelectionProvider) { - view.setSelectionProvider((ISelectionProvider) tool); - } - else { - view.setSelectionProvider(null); - } - } - - /** - * @see IPersistableEditor#restoreState(IMemento) - */ - @Override - public void restoreState(IMemento memento) { - if (memento == null) - return; - - Integer oldEpsg = memento.getInteger(MEMENTO_KEY_EPSG); - if (oldEpsg != null) { - GeoPosition p1 = new GeoPosition(memento.getFloat(MEMENTO_KEY_MIN_X), - memento.getFloat(MEMENTO_KEY_MIN_Y), oldEpsg); - GeoPosition p2 = new GeoPosition(memento.getFloat(MEMENTO_KEY_MAX_X), - memento.getFloat(MEMENTO_KEY_MAX_Y), oldEpsg); - - Set positions = new HashSet(); - positions.add(p1); - positions.add(p2); - zoomToPositions(positions); - } - } - - /** - * @see IPersistable#saveState(IMemento) - */ - @Override - public void saveState(IMemento memento) { - GeoPosition min = getMainMap().convertPointToGeoPosition( - new Point((int) Math.round(getMainMap().getWidth() * 0.1), - (int) Math.round(getMainMap().getHeight() * 0.1))); - GeoPosition max = getMainMap().convertPointToGeoPosition( - new Point((int) Math.round(getMainMap().getWidth() * 0.9), - (int) Math.round(getMainMap().getHeight() * 0.9))); - - // GeoPosition min = getMainMap().convertPointToGeoPosition(new Point(0, - // 0)); - // GeoPosition max = getMainMap().convertPointToGeoPosition(new - // Point(getMainMap().getWidth(), getMainMap().getHeight())); - - int epsg = min.getEpsgCode(); - - try { - if (epsg != max.getEpsgCode()) - max = GeotoolsConverter.getInstance().convert(max, epsg); - - memento.putFloat(MEMENTO_KEY_MIN_X, (float) min.getX()); - memento.putFloat(MEMENTO_KEY_MIN_Y, (float) min.getY()); - memento.putFloat(MEMENTO_KEY_MAX_X, (float) max.getX()); - memento.putFloat(MEMENTO_KEY_MAX_Y, (float) max.getY()); - - memento.putInteger(MEMENTO_KEY_EPSG, epsg); - } catch (IllegalGeoPositionException e) { - log.error("Error saving map state: Could not convert GeoPosition", e); //$NON-NLS-1$ - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapMenu.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapMenu.java deleted file mode 100644 index e1a99cac3b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapMenu.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.jface.action.ContributionItem; -import org.eclipse.jface.action.IContributionItem; -import org.eclipse.jface.action.Separator; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.MenuItem; - -import de.fhg.igd.mapviewer.view.cache.TileCacheContribution; -import de.fhg.igd.mapviewer.view.overlay.MapPainterContribution; -import de.fhg.igd.mapviewer.view.overlay.TileOverlayContribution; -import de.fhg.igd.mapviewer.view.server.MapServerContribution; - -/** - * Menu containing map related actions - * - * @author Simon Templer - */ -public class MapMenu extends ContributionItem { - - private final List overlayMenu; - - private final IContributionItem cacheMenu; - - private final Separator separator; - - private final IContributionItem serverMenu; - - /** - * Constructor - */ - public MapMenu() { - super(); - - cacheMenu = new TileCacheContribution(); - - overlayMenu = new ArrayList(); - overlayMenu.add(new TileOverlayContribution()); - overlayMenu.add(new MapPainterContribution()); - - separator = new Separator(); - - serverMenu = new MapServerContribution(); - } - - /** - * @see ContributionItem#fill(Menu, int) - */ - @Override - public void fill(Menu menu, int index) { - serverMenu.fill(menu, index); - - index = menu.getItemCount(); - - separator.fill(menu, index++); - - MenuItem item = new MenuItem(menu, SWT.CASCADE, index++); - item.setText(Messages.MapMenu_0); - Menu submenu = new Menu(item); - item.setMenu(submenu); - - for (IContributionItem con : overlayMenu) { - con.fill(submenu, 0); - } - - item = new MenuItem(menu, SWT.CASCADE, index++); - item.setText(Messages.MapMenu_1); - submenu = new Menu(item); - item.setMenu(submenu); - - cacheMenu.fill(submenu, 0); - } - - /** - * @see ContributionItem#isDynamic() - */ - @Override - public boolean isDynamic() { - return true; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapServiceFactory.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapServiceFactory.java deleted file mode 100644 index 62999d5ac5..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapServiceFactory.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view; - -import org.eclipse.ui.services.AbstractServiceFactory; -import org.eclipse.ui.services.IServiceLocator; - -import de.fhg.igd.mapviewer.view.cache.ITileCacheService; -import de.fhg.igd.mapviewer.view.cache.TileCacheService; -import de.fhg.igd.mapviewer.view.overlay.IMapPainterService; -import de.fhg.igd.mapviewer.view.overlay.ITileOverlayService; -import de.fhg.igd.mapviewer.view.overlay.MapPainterService; -import de.fhg.igd.mapviewer.view.overlay.TileOverlayService; -import de.fhg.igd.mapviewer.view.server.IMapServerService; -import de.fhg.igd.mapviewer.view.server.MapServerService; - -/** - * Factory for map related services - * - * @author Simon Templer - */ -public class MapServiceFactory extends AbstractServiceFactory { - - /** - * @see AbstractServiceFactory#create(Class, IServiceLocator, - * IServiceLocator) - */ - @Override - public Object create(Class serviceInterface, IServiceLocator parentLocator, - IServiceLocator locator) { - - if (serviceInterface.equals(IMapPainterService.class)) { - return new MapPainterService(); - } - - if (serviceInterface.equals(ITileOverlayService.class)) { - return new TileOverlayService(); - } - - if (serviceInterface.equals(IMapServerService.class)) { - return new MapServerService(); - } - - if (serviceInterface.equals(ITileCacheService.class)) { - return new TileCacheService(); - } - - return null; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapToolAction.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapToolAction.java deleted file mode 100644 index 64bbd93859..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapToolAction.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.ui.PlatformUI; - -import de.fhg.igd.mapviewer.BasicMapKit; -import de.fhg.igd.mapviewer.MapTool; -import de.fhg.igd.mapviewer.tools.AbstractMapTool; -import de.fhg.igd.mapviewer.tools.Activator; -import de.fhg.igd.mapviewer.view.arecalculation.AreaCalc; - -/** - * MapToolAction - * - * @author Simon Templer - * - * @version $Id$ - */ -public class MapToolAction extends Action implements Activator { - - private static final Log log = LogFactory.getLog(MapToolAction.class); - - private final AbstractMapTool tool; - - private final BasicMapKit mapKit; - - /** - * Creates an action that activates the given tool - * - * @param tool the map tool - * @param mapKit the map kit - * @param checked if the map tool shall be activated initially - */ - public MapToolAction(AbstractMapTool tool, BasicMapKit mapKit, boolean checked) { - super(tool.getName(), Action.AS_RADIO_BUTTON); - - tool.setMapKit(mapKit); - tool.setActivator(this); - - // set icon - if (tool.getIconURL() != null) { - try { - setImageDescriptor(ImageDescriptor.createFromURL(tool.getIconURL())); - } catch (Exception e) { - log.warn("Error creating action icon", e); //$NON-NLS-1$ - } - } - - // set tool tip - setToolTipText(tool.getDescription()); - - this.tool = tool; - this.mapKit = mapKit; - - if (checked) { - setChecked(true); - mapKit.setMapTool(tool); - } - } - - /** - * @see Activator#activate() - */ - @Override - public void activate() { - AreaCalc.getInstance().setArea(""); - PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { - - @Override - public void run() { - setChecked(true); - } - - }); - } - - /** - * @see Action#run() - */ - @Override - public void run() { - // if (isChecked()) { XXX not working in combination w/ - // HTMLToolTipProvider - mapKit.setMapTool(tool); - // } - } - - /** - * @return the {@link MapTool} - */ - public MapTool getTool() { - return tool; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapTools.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapTools.java deleted file mode 100644 index 2df3c1706c..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapTools.java +++ /dev/null @@ -1,241 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view; - -import java.util.HashMap; -import java.util.Map; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.IRegistryEventListener; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.action.ContributionItem; -import org.eclipse.swt.widgets.ToolBar; -import org.eclipse.ui.IMemento; -import org.eclipse.ui.IPersistable; -import org.eclipse.ui.IPersistableEditor; -import org.osgi.framework.Bundle; - -import de.fhg.igd.mapviewer.BasicMapKit; -import de.fhg.igd.mapviewer.MapTool; -import de.fhg.igd.mapviewer.tools.AbstractMapTool; -import de.fhg.igd.swingrcp.HTMLToolTipProvider; - -/** - * Map tools contribution item. - * - * @author Simon Templer - */ -public class MapTools extends ContributionItem - implements IRegistryEventListener, IPersistableEditor { - - private static final Log log = LogFactory.getLog(MapTools.class); - - private final HTMLToolTipProvider tips = new HTMLToolTipProvider(); - - private final BasicMapKit mapKit; - - private boolean dirty = true; - - private String defTool; - - private final Map tools = new HashMap(); - - /** - * Constructor - * - * @param mapKit the map kit - */ - public MapTools(BasicMapKit mapKit) { - this.mapKit = mapKit; - - Platform.getExtensionRegistry().addListener(this, MapTool.class.getName()); - } - - /** - * Retrieves a tool from the list of registered tools - * - * @param id the tool's ID - * @return the tool or null if there is no tool with such an ID - */ - public MapTool getTool(String id) { - return tools.get(id); - } - - /** - * @see ContributionItem#fill(ToolBar, int) - */ - @Override - public void fill(ToolBar parent, int index) { - // get map tool configurations - IConfigurationElement[] config = Platform.getExtensionRegistry() - .getConfigurationElementsFor(MapTool.class.getName()); - - SortedSet sortedTools = new TreeSet(); - - boolean defFound = false; - for (IConfigurationElement element : config) { - AbstractMapTool tool = createMapTool(element); - if (tool != null) { - sortedTools.add(tool); - if (tool.getId().equals(defTool)) { - defFound = true; - } - tools.put(tool.getId(), tool); - } - } - - boolean first = true; - for (AbstractMapTool tool : sortedTools) { - boolean def = (first && !defFound) || (defFound && tool.getId().equals(defTool)); - - MapToolAction action = new MapToolAction(tool, mapKit, def); - tips.createItem(action).fill(parent, index++); - - first = false; - } - - dirty = false; - } - - /** - * Create a map tool from a configuration element - * - * @param element the configuration element - * @return the map tool - */ - private static AbstractMapTool createMapTool(IConfigurationElement element) { - if (element.getName().equals("tool")) { //$NON-NLS-1$ - try { - AbstractMapTool tool = (AbstractMapTool) element.createExecutableExtension("class"); //$NON-NLS-1$ - - // id - tool.setId(element.getAttribute("class")); //$NON-NLS-1$ - - // priority - int priority; - try { - priority = Integer.parseInt(element.getAttribute("priority")); //$NON-NLS-1$ - } catch (NumberFormatException e) { - priority = 0; - } - tool.setPriority(priority); - - // configure tool - tool.setName(element.getAttribute("name")); //$NON-NLS-1$ - tool.setDescription(element.getAttribute("description")); //$NON-NLS-1$ - - // set icon URL - String icon = element.getAttribute("icon"); //$NON-NLS-1$ - if (icon != null && !icon.isEmpty()) { - String contributor = element.getDeclaringExtension().getContributor().getName(); - Bundle bundle = Platform.getBundle(contributor); - - if (bundle != null) { - tool.setIconURL(bundle.getResource(icon)); - } - } - - return tool; - } catch (Exception e) { - log.error("Error creating map tool", e); //$NON-NLS-1$ - return null; - } - } - - return null; - } - - /** - * @see ContributionItem#isDynamic() - */ - @Override - public boolean isDynamic() { - return true; - } - - /** - * @see org.eclipse.jface.action.ContributionItem#isDirty() - */ - @Override - public boolean isDirty() { - return dirty; - } - - /** - * @see IRegistryEventListener#added(org.eclipse.core.runtime.IExtension[]) - */ - @Override - public void added(IExtension[] extensions) { - // XXX how to force update??? - dirty = true; - getParent().markDirty(); - // getParent().update(true); - } - - /** - * @see IRegistryEventListener#added(org.eclipse.core.runtime.IExtensionPoint[]) - */ - @Override - public void added(IExtensionPoint[] extensionPoints) { - // ignore - } - - /** - * @see IRegistryEventListener#removed(org.eclipse.core.runtime.IExtension[]) - */ - @Override - public void removed(IExtension[] extensions) { - // XXX how to force update? - dirty = true; - getParent().markDirty(); - // getParent().update(true); - } - - /** - * @see IRegistryEventListener#removed(org.eclipse.core.runtime.IExtensionPoint[]) - */ - @Override - public void removed(IExtensionPoint[] extensionPoints) { - // ignore - } - - /** - * @see IPersistableEditor#restoreState(IMemento) - */ - @Override - public void restoreState(IMemento memento) { - if (memento == null) - return; - - defTool = memento.getTextData(); - } - - /** - * @see IPersistable#saveState(IMemento) - */ - @Override - public void saveState(IMemento memento) { - if (mapKit.getMapTool() != null) { - memento.putTextData(mapKit.getMapTool().getId()); - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapView.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapView.java deleted file mode 100644 index d469a0bbd8..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapView.java +++ /dev/null @@ -1,292 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view; - -import java.awt.BorderLayout; - -import javax.swing.SwingUtilities; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.IToolBarManager; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.IActionBars; -import org.eclipse.ui.IMemento; -import org.eclipse.ui.IPartListener2; -import org.eclipse.ui.IPartService; -import org.eclipse.ui.IViewSite; -import org.eclipse.ui.IWorkbenchPartReference; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.part.ViewPart; -import org.eclipse.ui.part.WorkbenchPart; - -import de.fhg.igd.mapviewer.BasicMapKit; -import de.fhg.igd.mapviewer.tip.MapTipManager; -import de.fhg.igd.swingrcp.SwingComposite; - -/** - * MapView - * - * @author Simon Templer - */ -public class MapView extends AbstractMapView implements IPartListener2 { - - private static final String MEMENTO_TOOLS = "tools"; //$NON-NLS-1$ - - private static final String MEMENTO_MAP = "map"; //$NON-NLS-1$ - - private static final Log log = LogFactory.getLog(MapView.class); - - /** - * The ID of this View - */ - public static final String ID = "de.fhg.igd.mapviewer.view.MapView"; //$NON-NLS-1$ - - private SwingComposite main; - - private ExtendedMapKit mapKit; - - private MapTools mapTools; - - private IMemento initMemento; - - private final MapTipManager mapTips = new MapTipManager(); - - /** - * The constructor. - */ - public MapView() { - } - - /** - * @see ViewPart#init(IViewSite, IMemento) - */ - @Override - public void init(IViewSite site, IMemento memento) throws PartInitException { - super.init(site, memento); - - this.initMemento = memento; - - IPartService partService = site.getService(IPartService.class); - partService.addPartListener(this); - } - - /** - * @see ViewPart#saveState(IMemento) - */ - @Override - public void saveState(IMemento memento) { - mapTools.saveState(memento.createChild(MEMENTO_TOOLS)); - mapKit.saveState(memento.createChild(MEMENTO_MAP)); - - super.saveState(memento); - } - - /** - * @see WorkbenchPart#createPartControl(Composite) - */ - @Override - public void createPartControl(Composite parent) { - super.createPartControl(parent); - - main = new SwingComposite(parent); - main.getContentPane().setLayout(new BorderLayout()); - - mapKit = new ExtendedMapKit(MapView.this); - main.getContentPane().add(mapKit, BorderLayout.CENTER); - - // actions - configureActions(); - - // restore state - mapTools.restoreState( - (initMemento != null) ? (initMemento.getChild(MEMENTO_TOOLS)) : (null)); - - // status - new PositionStatus(mapKit.getMainMap(), getViewSite(), getTitleImage(), epsgProvider); - new PositionStatus(mapKit.getMiniMap(), getViewSite(), getTitleImage(), epsgProvider); - - // view activator - ViewActivator activator = new ViewActivator(getViewSite()); - activator.addComponent(mapKit.getMainMap()); - activator.addComponent(mapKit.getMiniMap()); - } - - /** - * @see WorkbenchPart#setFocus() - */ - @Override - public void setFocus() { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - main.getContentPane().requestFocus(); - } - }); - } - - /** - * Configure menu and toolbar actions and register map view extensions - */ - public void configureActions() { - IActionBars bars = getViewSite().getActionBars(); - - // tool-bar - IToolBarManager toolBar = bars.getToolBarManager(); - toolBar.add(mapTools = new MapTools(mapKit)); - - // menu - IMenuManager menu = bars.getMenuManager(); - menu.add(new MapMenu()); - - // extensions - IConfigurationElement[] config = Platform.getExtensionRegistry() - .getConfigurationElementsFor(MapViewExtension.class.getName()); - - for (IConfigurationElement element : config) { - if (element.getName().equals("extra")) { //$NON-NLS-1$ - try { - MapViewExtension extra = (MapViewExtension) element - .createExecutableExtension("class"); //$NON-NLS-1$ - extra.setMapView(this); - } catch (Exception e) { - log.warn("Error creating map view extension", e); //$NON-NLS-1$ - } - } - } - - // add map tips - mapKit.addCustomPainter(mapTips); - } - - /** - * @return the mapTips - */ - public MapTipManager getMapTips() { - return mapTips; - } - - /** - * @return the map kit - */ - public BasicMapKit getMapKit() { - return mapKit; - } - - /** - * @return the map tools - */ - public MapTools getMapTools() { - return mapTools; - } - - /** - * @see IPartListener2#partVisible(IWorkbenchPartReference) - */ - @Override - public void partVisible(IWorkbenchPartReference partRef) { - // ignore - } - - /** - * @see IPartListener2#partActivated(IWorkbenchPartReference) - */ - @Override - public void partActivated(IWorkbenchPartReference partRef) { - // ignore - } - - /** - * @see IPartListener2#partBroughtToTop(IWorkbenchPartReference) - */ - @Override - public void partBroughtToTop(IWorkbenchPartReference partRef) { - // ignore - } - - /** - * @see IPartListener2#partClosed(IWorkbenchPartReference) - */ - @Override - public void partClosed(IWorkbenchPartReference partRef) { - if (partRef.getPart(false) == this) { - // do nothing - } - } - - /** - * @see IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference) - */ - @Override - public void partDeactivated(IWorkbenchPartReference partRef) { - // ignore - } - - /** - * @see IPartListener2#partHidden(IWorkbenchPartReference) - */ - @Override - public void partHidden(IWorkbenchPartReference partRef) { - // ignore - } - - /** - * @see IPartListener2#partInputChanged(IWorkbenchPartReference) - */ - @Override - public void partInputChanged(IWorkbenchPartReference partRef) { - // ignore - } - - /** - * @see IPartListener2#partOpened(IWorkbenchPartReference) - */ - @Override - public void partOpened(IWorkbenchPartReference partRef) { - if (partRef.getPart(false) == this) { - // do nothing - expecting restoreState to be called by extensions - } - } - - /** - * Restore the map state from the view memento. - */ - public void restoreState() { - // restore state (e.g. the first time the view becomes visible) - final Display display = Display.getCurrent(); - // must be done like this because of mapKit.zoomToPositions - - // else there is no component width/height set - display.asyncExec(new Runnable() { - - @Override - public void run() { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - mapKit.restoreState((initMemento != null) - ? (initMemento.getChild(MapView.MEMENTO_MAP)) : (null)); - } - }); - } - }); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapViewExtension.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapViewExtension.java deleted file mode 100644 index 769f6e46f5..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapViewExtension.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view; - -/** - * Map view extension interface. - * - * @author Simon Templer - */ -public interface MapViewExtension { - - /** - * Set the map view - * - * @param mapView the map view to set - */ - public void setMapView(MapView mapView); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapviewerPlugin.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapviewerPlugin.java deleted file mode 100644 index f94f452b8e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/MapviewerPlugin.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view; - -import java.util.Hashtable; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceRegistration; - -import de.fhg.igd.mapviewer.concurrency.Concurrency; -import de.fhg.igd.mapviewer.concurrency.Executor; -import de.fhg.igd.mapviewer.concurrency.JobExecutor; - -/** - * Mapviewer plugin activator - * - * @author Simon Templer - */ -public class MapviewerPlugin extends AbstractUIPlugin { - - /** - * The plug-in ID - */ - public static final String PLUGIN_ID = "de.fhg.igd.mapviewer"; //$NON-NLS-1$ - - /** - * The shared instance - */ - private static MapviewerPlugin _plugin; - - private ServiceRegistration service; - - /** - * The constructor - */ - public MapviewerPlugin() { - // nothing to do here - } - - /** - * @see AbstractUIPlugin#start(BundleContext) - */ - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - _plugin = this; - service = context.registerService(Executor.class, new JobExecutor(), - new Hashtable()); - Concurrency.getInstance().start(context); - } - - /** - * @see AbstractUIPlugin#stop(BundleContext) - */ - @Override - public void stop(BundleContext context) throws Exception { - _plugin = null; - Concurrency.getInstance().stop(); - if (service != null) { - service.unregister(); - } - super.stop(context); - } - - /** - * @return the shared instance - */ - public static MapviewerPlugin getDefault() { - return _plugin; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/Messages.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/Messages.java deleted file mode 100644 index 6a2f254dbd..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/Messages.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view; - -import org.eclipse.osgi.util.NLS; - -/** - * Map view messages - * - * @author Simon Templer - */ -@SuppressWarnings("all") -public class Messages extends NLS { - - private static final String BUNDLE_NAME = "de.fhg.igd.mapviewer.view.messages"; //$NON-NLS-1$ - public static String MapMenu_0; - public static String MapMenu_1; - - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/PositionStatus.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/PositionStatus.java deleted file mode 100644 index 147b13d91f..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/PositionStatus.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view; - -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; -import java.util.Locale; - -import org.eclipse.swt.graphics.Image; -import org.eclipse.ui.IViewSite; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.JXMapViewer; - -import de.fhg.igd.mapviewer.view.arecalculation.AreaCalc; - -/** - * Shows the current mouse position in the status line - * - * @author Simon Templer - */ -public class PositionStatus extends MouseAdapter { - - /** - * EPSG provider interface - */ - public interface EpsgProvider { - - /** - * Get the EPSG code of a CRS - * - * @return the EPSG code, zero for no code - */ - public int getEpsgCode(); - } - - private final JXMapViewer map; - - private final IViewSite site; - - private final Image image; - - private final EpsgProvider epsgProvider; - - private final DecimalFormat format = new DecimalFormat("0.####", //$NON-NLS-1$ - DecimalFormatSymbols.getInstance(Locale.ENGLISH)); - - /** - * Constructor - * - * @param map the map component - * @param site the view site - * @param image the message image - * @param epsgProvider the EPSG provider - */ - public PositionStatus(JXMapViewer map, IViewSite site, Image image, - final EpsgProvider epsgProvider) { - this.map = map; - this.site = site; - this.image = image; - this.epsgProvider = epsgProvider; - - map.addMouseMotionListener(this); - map.addMouseListener(this); - - // - AreaCalc.getInstance().setMap(map); - } - - /** - * @see MouseAdapter#mouseMoved(MouseEvent) - */ - @Override - public void mouseMoved(MouseEvent e) { - GeoPosition pos = map.convertPointToGeoPosition(e.getPoint()); - - // convert if needed and possible - int target = epsgProvider.getEpsgCode(); - if (target != 0) { - try { - pos = GeotoolsConverter.getInstance().convert(pos, target); - } catch (Exception x) { - // ignore - } - } - - final GeoPosition position = pos; - - // set current GeoPosition - AreaCalc.getInstance().setCurrentGeoPos(pos); - - site.getShell().getDisplay().asyncExec(new Runnable() { - - @Override - public void run() { - site.getActionBars().getStatusLineManager().setMessage(image, - "EPSG:" + position.getEpsgCode() + " - " + //$NON-NLS-1$ //$NON-NLS-2$ - format.format(position.getX()) + " / " + //$NON-NLS-1$ - format.format(position.getY())); - } - }); - } - - /** - * @see MouseAdapter#mouseExited(MouseEvent) - */ - @Override - public void mouseExited(MouseEvent e) { - site.getShell().getDisplay().asyncExec(new Runnable() { - - @Override - public void run() { - site.getActionBars().getStatusLineManager().setMessage(null); - } - }); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/SelectionProviderFacade.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/SelectionProviderFacade.java deleted file mode 100644 index cbcf7af40b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/SelectionProviderFacade.java +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view; - -import org.eclipse.core.runtime.ListenerList; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PlatformUI; - -/** - * Based on AbstractSelectionMediator - * - * @author Michel Kraemer - * @author Simon Templer - */ -public class SelectionProviderFacade implements ISelectionProvider { - - /** - * The object whose events shall be filtered - */ - private ISelectionProvider _decoratee; - - /** - * A list of selection listeners - */ - private final ListenerList _selectionListeners = new ListenerList<>(); - - private final ISelectionChangedListener selectionListener = new ISelectionChangedListener() { - - @Override - public void selectionChanged(SelectionChangedEvent event) { - doSelectionChanged(); - } - }; - - /** - * Set the current selection provider - * - * @param prov the selection provider - */ - public void setSelectionProvider(ISelectionProvider prov) { - if (_decoratee != null) { - _decoratee.removeSelectionChangedListener(selectionListener); - } - - _decoratee = prov; - - if (_decoratee != null) { - _decoratee.addSelectionChangedListener(selectionListener); - } - } - - /** - * @return the object whose events shall be filtered - */ - public ISelectionProvider getDecoratee() { - return _decoratee; - } - - /** - * @see ISelectionProvider#addSelectionChangedListener(ISelectionChangedListener) - */ - @Override - public void addSelectionChangedListener(ISelectionChangedListener listener) { - _selectionListeners.add(listener); - } - - /** - * @see ISelectionProvider#removeSelectionChangedListener(ISelectionChangedListener) - */ - @Override - public void removeSelectionChangedListener(ISelectionChangedListener listener) { - _selectionListeners.remove(listener); - } - - /** - * @see ISelectionProvider#setSelection(ISelection) - */ - @Override - public void setSelection(ISelection selection) { - if (_decoratee != null) { - _decoratee.setSelection(selection); - } - fireSelectionChanged(); - } - - /** - * This method will be called when the selection of the decoratee changed - */ - private void doSelectionChanged() { - fireSelectionChanged(); - } - - /** - * Notifies the selection listeners about a new selection - */ - private void fireSelectionChanged() { - if (Display.getCurrent() != null) { - fireSelectionChangedInternal(); - } - else { - final Display display = PlatformUI.getWorkbench().getDisplay(); - display.syncExec(new Runnable() { - - @Override - public void run() { - fireSelectionChangedInternal(); - } - }); - } - } - - /** - * Notifies the selection listeners about a new selection, should be called - * only by {@link #fireSelectionChanged()} - */ - private void fireSelectionChangedInternal() { - SelectionChangedEvent event = new SelectionChangedEvent(this, getSelection()); - - Object[] listeners = _selectionListeners.getListeners(); - for (int i = 0; i < listeners.length; i++) { - ISelectionChangedListener listener = (ISelectionChangedListener) listeners[i]; - listener.selectionChanged(event); - } - } - - /** - * @see ISelectionProvider#getSelection() - */ - @Override - public ISelection getSelection() { - if (_decoratee != null) { - return _decoratee.getSelection(); - } - else { - return null; - } - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/ViewActivator.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/ViewActivator.java deleted file mode 100644 index 8da017074e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/ViewActivator.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.view; - -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - -import javax.swing.JComponent; - -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.IViewSite; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; - -/** - * The view activator ensures that the view containing Swing components is - * activated when the mouse is pressed on one of the components. The components - * have to be added to the activator through {@link #addComponent(JComponent)}. - * - * @author Simon Templer - */ -public class ViewActivator { - - private final String viewId; - private final MouseAdapter mouseAdapter; - - /** - * Create a view activator. - * - * @param viewSite the site associated to the view - */ - public ViewActivator(IViewSite viewSite) { - viewId = viewSite.getId(); - - mouseAdapter = new MouseAdapter() { - - @Override - public void mousePressed(MouseEvent e) { - // activate the view if not yet active - final Display display = PlatformUI.getWorkbench().getDisplay(); - display.syncExec(new Runnable() { - - @Override - public void run() { - if (!viewId.equals(PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getActivePage().getActivePart().getSite().getId())) { - try { - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() - .showView(viewId); - } catch (PartInitException e) { - // ignore - } - } - } - }); - } - }; - } - - /** - * Add a component where a mouse press shall ensure that the view is - * activated. - * - * @param c the component to added the activator's mouse listener to - */ - public void addComponent(JComponent c) { - c.addMouseListener(mouseAdapter); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/AreaCalc.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/AreaCalc.java deleted file mode 100644 index 9f2ecf419d..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/AreaCalc.java +++ /dev/null @@ -1,735 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.view.arecalculation; - -import java.awt.geom.Point2D; -import java.text.NumberFormat; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.measure.Unit; -import javax.measure.quantity.Length; - -import org.geotools.referencing.CRS; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.JXMapViewer; -import org.opengis.referencing.cs.CoordinateSystem; -import org.opengis.referencing.cs.CoordinateSystemAxis; - -import de.fhg.igd.geom.Point3D; -import de.fhg.igd.geom.algorithm.FaceTriangulation; - -/** - * This class manages the calculation of any 2D surface. - * - * @author Andreas Burchert - */ -public class AreaCalc extends Thread { - - /** - * Instance of this class. - */ - private static AreaCalc instance = null; - - /** - * Calculation is active (default: false) - */ - private static boolean active = false; - - /** - * True if a calculation is in progress. - */ - private boolean calculation = false; - -// /** -// * Contains true if a update for GeoPositions is available. -// */ -// private boolean updated = false; - - /** - * This is needed for not calculating permanently. - */ - private boolean bufferIsFinished = false; - - /** - * Last update run for GeoCoordinates. - */ - private long lastUpdate = 0; - - /** - * Delay in ms. - */ - private final long delay = 100; - - /** - * Contains the view. - */ - private JXMapViewer map = null; - - /** - * Contains all vertexes - */ - private List geoPos = new ArrayList(300); - - /** - * Contains the current GeoPosition - */ - private GeoPosition currentGeoPos = new GeoPosition(0, 0, 0); - - private final Set listeners = new HashSet(); - - /** - * Contains the type of selection: rectangle, polygon, buffer, line FIXME - * use an enumeration for this - */ - private String selectionType = ""; - - /** - * Contains a formatted String with the surface area. - */ - private String area = ""; - - /** - * Constructor. - */ - public AreaCalc() { - /* nothing */ - } - - /** - * @see Thread#run() - */ - @Override - public void run() { - while (isActive()) { - this.calculate(); - - try { - sleep(this.delay); - } catch (InterruptedException e) { - e.printStackTrace(); - - // try to get this thread back - instance.start(); - } - } - } - - /** - * Add an area listener - * - * @param listener the listener to add - */ - public void addListener(AreaListener listener) { - listeners.add(listener); - } - - /** - * Remove an area listener - * - * @param listener the listener to remove - */ - public void removeListener(AreaListener listener) { - listeners.remove(listener); - } - - /** - * @return current instance of AreaCalc - */ - public static AreaCalc getInstance() { - if (instance == null) { - AreaCalc tmp = new AreaCalc(); - tmp.setName("AreaCalculation"); - tmp.start(); - instance = tmp; - } - - return instance; - } - - /** - * @param state activestate - */ - public void setActive(boolean state) { - if (!AreaCalc.active) { - new Thread(instance).start(); - } - - active = state; - fireActiveChanged(); - } - - /** - * @return action state - */ - public boolean isActive() { - return active; - } - - /** - * Adds the ToolTip to {@link JXMapViewer}. - * - * @param map mapviewer - */ - public void setMap(JXMapViewer map) { - if (this.map == null) { - // set "big" map - this.map = map; - } - } - - /** - * Setter for current {@link GeoPosition}. - * - * @param pos current GeoPosition - */ - public void setCurrentGeoPos(GeoPosition pos) { - if (!pos.equals(this.currentGeoPos)) { - this.currentGeoPos = pos; -// this.updated = true; - } - } - - /** - * Setter for all selected {@link GeoPosition}s. - * - * @param pos from AbstractMapTool - */ - public void setGeoPositions(List pos) { - if (!pos.equals(this.geoPos)) { - this.geoPos = pos; -// this.updated = true; - } - } - - /** - * Converts a Polygon to GeoPositions. - * - * @param buffer contains the polygon - */ - public void setBufferPolygon(java.awt.Polygon buffer) { - if (!calculation && this.lastUpdate < System.currentTimeMillis()) { - List pts = new ArrayList(buffer.npoints); - - // create Point2D and add them - for (int i = 0; i < buffer.xpoints.length; i++) { - pts.add(new Point2D.Double(buffer.xpoints[i], buffer.ypoints[i])); - } - - this.setPoint2DAsGeoPositions(pts); - } - } - - /** - * This function sets {@link java.awt.geom.Point2D} coordinates as - * {@link GeoPosition} to calculate the surface area. - * - * @param points List of {@link java.awt.geom.Point2D} - */ - public void setPoint2DAsGeoPositions(List points) { - if (isActive()) { - this.geoPos = this.map.convertAllPointsToGeoPositions(points); - } - - this.lastUpdate = System.currentTimeMillis() + this.delay; - } - - /** - * Setter for selection type. - * - * @param type new selection type - */ - public void setSelectionType(String type) { - if (!type.equals(this.selectionType)) { - if (!type.equals("buffer")) { - this.bufferIsFinished = false; - } - this.selectionType = type; - this.area = ""; - fireAreaChanged(); - } - } - - /** - * - */ - public void bufferReset() { - this.bufferIsFinished = false; - this.geoPos.clear(); - } - - /** - * Setter for {@link AreaCalc#area}. Used for external access. - * - * @param text new text - */ - public void setArea(String text) { - this.area = text; - fireAreaChanged(); - } - - private void fireAreaChanged() { - for (AreaListener listener : listeners) { - listener.areaChanged(area); - } - } - - private void fireActiveChanged() { - for (AreaListener listener : listeners) { - listener.activationStateChanged(active); - } - } - - /** - * Returns lastUpdate. - * - * @return lastUpdate in milliseconds - */ - public long getLastUpdate() { - return this.lastUpdate; - } - - /** - * Returns the formatted area. - * - * @return the area - */ - public String getArea() { - return this.area; - } - - /** - * Checks if GeoPosition are in a metric system and if not convert them if - * necessary. - * - * @param pos List of {@link GeoPosition} - * - * @return List of {@link GeoPosition} - */ - public List checkEPSG(List pos) { - // list is empty - if (pos.size() == 0) { - return pos; - } - - // - int epsg = pos.get(0).getEpsgCode(); - int FALLBACK_EPSG = 3395; // Worldmercator - FALLBACK_EPSG = 4326; // WGS84 - - try { - CoordinateSystem cs = CRS.decode("EPSG:" + epsg).getCoordinateSystem(); - - for (int i = 0; epsg != FALLBACK_EPSG && i < cs.getDimension(); i++) { - CoordinateSystemAxis axis = cs.getAxis(i); - - try { - Unit unit = axis.getUnit().asType(Length.class); - - if (!unit.toString().equals("m")) { //$NON-NLS-1$ - // not metric - epsg = FALLBACK_EPSG; - } - } catch (ClassCastException e) { - // no length unit - epsg = FALLBACK_EPSG; - } - } - } catch (Exception e) { - e.printStackTrace(); - } - - // convert all coordinates - try { - GeotoolsConverter g = (GeotoolsConverter) GeotoolsConverter.getInstance(); - pos = g.convertAll(pos, epsg); - } catch (IllegalGeoPositionException e1) { - e1.printStackTrace(); - } - - return pos; - } - - /** - * This function calculates the area of a polygon. - */ - public void calculate() { - if (isActive() && this.geoPos.size() > 0 && !this.calculation - /* && this.updated */ && !this.bufferIsFinished) { - // set calculation to true to prevent double calculating - this.calculation = true; - - // but allow new position data -// this.updated = false; - - List pos = new ArrayList(); - pos.addAll(this.geoPos); - pos.add(this.currentGeoPos); - - // contains information for the tooltip - String tip = ""; - - // check epsg code and maybe convert to a metric system - pos = this.checkEPSG(pos); - - // initialize formater - NumberFormat df = NumberFormat.getNumberInstance(); - - // calculate size - double area = 0.0; - - // rectangle - if (pos.size() == 2 && this.selectionType.equals("rectangle")) { - area = this.calculateRectangle(pos.get(0), pos.get(1)); - if (area > 1000000) { - area /= 1000000; - tip = df.format(area) + " km\u00B2"; - } - else { - tip = df.format(area) + " m\u00B2"; - } - } - // distance (polygon tool) - else if (pos.size() == 2 && this.selectionType.equals("polygon")) { - area = AreaCalc.calculateDistance(pos.get(0), pos.get(1)); - tip = df.format(area) + " m"; - } - // distance (buffer tool) - else if (pos.size() > 1 && this.selectionType.equals("line")) { - double temp = 0.0; - - for (int i = 0; i < pos.size() - 1; i++) { - temp += AreaCalc.calculateDistance(pos.get(i), pos.get(i + 1)); - } - tip = df.format(temp) + " m"; - } - // polygon - else if (pos.size() > 2 && this.selectionType.equals("polygon")) { - area = this.calculatePolygon(pos); - if (area > 1000000) { - area /= 1000000; - tip = df.format(area) + " km\u00B2"; - } - else { - tip = df.format(area) + " m\u00B2"; - } - } - - // buffer tool - else if (this.selectionType.equals("buffer")) { - if (pos.size() == 2) { - area = AreaCalc.calculateDistance(pos.get(0), pos.get(1)); - tip = df.format(area) + " m"; - } - else { - // calculate - area = this.calculatePolygon(pos); - if (area > 1000000) { - area /= 1000000; - tip = df.format(area) + " km\u00B2"; - } - else { - tip = df.format(area) + " m\u00B2"; - } - } - } - - // update tooltip - this.area = tip; - - fireAreaChanged(); - - // calculation has finished - this.calculation = false; - } - } - - /** - * Calculates the distance between two geo coordinates using the haversine - * formula. - * - * @param a first {@link GeoPosition} - * @param b second {@link GeoPosition} - * - * @return area - */ - public static double calculateDistance(GeoPosition a, GeoPosition b) { - double value = 0.0; - - // use haversine for wgs84 related systems - if (a.getEpsgCode() >= 4326 && a.getEpsgCode() <= 4329) { - value = AreaCalc.haversine(a, b); - } - else { - value = Math - .sqrt(Math.pow((a.getX() - b.getX()), 2) + Math.pow((a.getY() - b.getY()), 2)); - } - - return value; - } - - /** - * Calculates the distance between to points. - * - * @param StartP source - * @param EndP destination - * - * @return distance - */ - public static double haversine(GeoPosition StartP, GeoPosition EndP) { - // Earth radius - double Radius = 6.371; - - // latitude - double lat1 = StartP.getY(); - double lat2 = EndP.getY(); - - // longitude - double lon1 = StartP.getX(); - double lon2 = EndP.getX(); - - // convert to radians - double dLat = Math.toRadians(lat2 - lat1); - double dLon = Math.toRadians(lon2 - lon1); - - // calculation - double a = Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.cos(Math.toRadians(lat1)) - * Math.cos(Math.toRadians(lat2)) * Math.sin(dLon / 2) * Math.sin(dLon / 2); - double c = 2 * Math.asin(Math.sqrt(a)); - - // multiplication with 1mio is needed for correct values - return Radius * c * Math.pow(1000, 2); - } - - /** - * Calculate the area of a rectangle. - * - * @param a first {@link GeoPosition} - * @param b second {@link GeoPosition} - * - * @return area - */ - public double calculateRectangle(GeoPosition a, GeoPosition b) { - double value = 0.0; - - value = AreaCalc.calculateDistance(new GeoPosition(a.getX(), a.getY(), a.getEpsgCode()), - new GeoPosition(b.getX(), a.getY(), a.getEpsgCode())) - * AreaCalc.calculateDistance(new GeoPosition(a.getX(), a.getY(), a.getEpsgCode()), - new GeoPosition(a.getX(), b.getY(), a.getEpsgCode())); - - return Math.abs(value); - } - - /** - * Function to calculate the surface of a polygon. - * - * @param pos List of {@link GeoPosition} - * - * @return area - */ - public double calculatePolygon(List pos) { - // contains the result - double result = 0.0; - - // epsg code - int epsg = pos.get(0).getEpsgCode(); - - // check if it can be done with the shoelace formula - if (epsg >= 31461 && epsg <= 31469) { - result = this.shoelaceFormula(pos); - } - - if (result == 0.0) { - result = this.heronFormula(pos); - } - - return result; - } - - /** - * Heron formula. - * - * @param pos List of {@link GeoPosition} - * - * @return area - */ - private double heronFormula(List pos) { - double result = 0.0; - - List triangles = this.triangulate(pos); - - for (Triangle t : triangles) { - result += t.getArea(); - } - - return result; - } - - /** - * Triangulates the polygon. - * - * @param pos List of {@link GeoPosition} - * - * @return List of {@link Triangle} - */ - private List triangulate(List pos) { - // contains all triangles - List triangles = new ArrayList(pos.size() - 1); - - // standard epsg code - int epsg = pos.get(0).getEpsgCode(); - - // check if it's already a triangle - if (pos.size() == 3) { - triangles.add(new Triangle(pos.get(0), pos.get(1), pos.get(2))); - return triangles; - } - - // contains all points from the surface - List face = new ArrayList<>(); - - // convert Point2D to Vertex - for (int i = 0; i < pos.size(); i++) { - GeoPosition p = pos.get(i); - face.add(new Point3D(p.getX(), p.getY(), 0.0)); - } - - // create FaceSet and triangulate - FaceTriangulation fst = new FaceTriangulation(); - List> faces = fst.triangulateFace(face); - - // convert - for (List f : faces) { - // create GeoPositions - GeoPosition p1, p2, p3; - p1 = new GeoPosition(f.get(0).getX(), f.get(0).getY(), epsg); - p2 = new GeoPosition(f.get(1).getX(), f.get(1).getY(), epsg); - p3 = new GeoPosition(f.get(2).getX(), f.get(2).getY(), epsg); - - // add triangle - triangles.add(new Triangle(p1, p2, p3)); - } - - return triangles; - } - - /** - * Gauss' Area Formula - * - * @param positions polygon - * - * @return the base of the polygon - */ - private double shoelaceFormula(List positions) { - double result = 0; -// int epsg = positions.get(0).getEpsgCode(); - - ArrayList listY = new ArrayList(); - ArrayList listX = new ArrayList(); - for (GeoPosition v : positions) { - listY.add(v.getY()); - listX.add(v.getX()); - } - - for (int i = 0; i < listX.size(); i++) { - result = result + listX.get(i) - * (listY.get(getFirst(i, listY)) - listY.get(getSecond(i, listY))); - } - - result = result / 2; - - // - double reduction = 0.0; - - // earth's radius -// double Radius = 6.371; - - // default: no reduction -// double y; -// -// switch(epsg) { -// // 3-degree Gauss zone 1 -// case 31461: -// y = 1; -// break; -// -// // 3-degree Gauss zone 2 -// case 31462: -// case 31466: -// y = 2; -// break; -// -// // 3-degree Gauss zone 3 -// case 31463: -// case 31467: -// y = 3; -// break; -// -// // 3-degree Gauss zone 4 -// case 31464: -// case 31468: -// y = 4; -// break; -// -// // 3-degree Gauss zone 5 -// case 31465: -// case 31469: -// y = 5; -// break; -// default: -// y = 0; -// } - - // calculate reduction for gauss-kruger-systems - // reduction = (result * Math.pow(y, 2))/Math.pow(Radius, 2); - - return Math.abs(result - reduction)/* *10000 */; - } - - /** - * Help method for gauss - * - * @param i nn - * @param listY nn - * - * @return the first value - */ - private int getFirst(int i, ArrayList listY) { - if (i == listY.size() - 1) { - return 0; - } - return (i + 1); - } - - /** - * Help method for gauss - * - * @param i nn - * @param listY nn - * - * @return the second value - */ - private int getSecond(int i, ArrayList listY) { - if (i == 0) { - return listY.size() - 1; - } - return (i - 1); - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/AreaListener.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/AreaListener.java deleted file mode 100644 index fab41a0da9..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/AreaListener.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.view.arecalculation; - -/** - * Listens on area changes - * - * @author Simon Templer - */ -public interface AreaListener { - - /** - * Informs about a changed area - * - * @param area the area - */ - public void areaChanged(String area); - - /** - * Informs about activation/deactivation of the calculation - * - * @param active if it is active - */ - public void activationStateChanged(boolean active); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/AreaMapTip.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/AreaMapTip.java deleted file mode 100644 index 19c6f33e7f..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/AreaMapTip.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.view.arecalculation; - -import java.awt.Point; - -import de.fhg.igd.mapviewer.tip.AbstractMapTip; - -/** - * MapTip for {@link AreaCalc}. - * - * @author Andreas Burchert - */ -public class AreaMapTip extends AbstractMapTip implements AreaListener { - - private final AreaCalc calc; - - /** - * Constructor - * - * @param calc the associated area calculator - */ - public AreaMapTip(AreaCalc calc) { - this.calc = calc; - - calc.addListener(this); - - if (calc.isActive()) { - setTipText(calc.getArea(), null); - } - } - - /** - * @see AbstractMapTip#position(int, int, int, int, int, int) - */ - @Override - protected Point position(int x, int y, int tipHeight, int tipWidth, int viewWidth, - int viewHeight) { - // position below mouse - // TODO respect bounds - x += 5; - y += 5; - - return new Point(x, y); - } - - /** - * @see AbstractMapTip#dispose() - */ - @Override - protected void dispose() { - calc.removeListener(this); - } - - /** - * @see AbstractMapTip#useMousePos() - */ - @Override - protected boolean useMousePos() { - return true; - } - - /** - * @see AbstractMapTip#wantsToPaint() - */ - @Override - public boolean wantsToPaint() { - return super.wantsToPaint() && calc.isActive(); - } - - /** - * @see AreaListener#areaChanged(java.lang.String) - */ - @Override - public void areaChanged(String area) { - setTipText(area, null); - } - - /** - * @see AreaListener#activationStateChanged(boolean) - */ - @Override - public void activationStateChanged(boolean active) { - if (active) { - setTipText(calc.getArea(), null); - } - else { - clearTip(); - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/MeasureAction.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/MeasureAction.java deleted file mode 100644 index a6afd54a47..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/MeasureAction.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.view.arecalculation; - -import org.eclipse.jface.action.Action; - -/** - * @author Andreas - * Burchert - */ -public class MeasureAction extends Action { - - /** - * @see Action - * @param checked current active state - */ - public MeasureAction(boolean checked) { - setChecked(checked); - } - - /** - * @see Action#run() - */ - @Override - public void run() { - AreaCalc.getInstance().setActive(this.isChecked()); - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/Triangle.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/Triangle.java deleted file mode 100644 index 7339e51c8b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/arecalculation/Triangle.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.view.arecalculation; - -import org.jdesktop.swingx.mapviewer.GeoPosition; - -/** - * This class represents a triangle in 2D. It provides functionality to - * calculate it's surface area. - * - * @author Andreas Burchert - */ -public class Triangle { - - /** - * Contains all vertices. - */ - private GeoPosition p1, p2, p3; - - /** - * Contains the surface area. - */ - private double area = 0.0; - - /** - * Constructor. - * - * @param p1 first {@link GeoPosition} - * @param p2 second {@link GeoPosition} - * @param p3 third {@link GeoPosition} - */ - public Triangle(GeoPosition p1, GeoPosition p2, GeoPosition p3) { - this.p1 = p1; - this.p2 = p2; - this.p3 = p3; - - this.area = this.heronFormula(); - } - - /** - * Calculates the area with use of Heron's formula. - * - * @return area - */ - private double heronFormula() { - double result = 0.0; - - double a, b, c, s; - a = AreaCalc.calculateDistance(p1, p2); - b = AreaCalc.calculateDistance(p1, p3); - c = AreaCalc.calculateDistance(p2, p3); - - s = (a + b + c) / 2; - - result = Math.sqrt(s * (s - a) * (s - b) * (s - c)); - - return result; - } - - /** - * Returns the surface area for this triangle. - * - * @return area - */ - public double getArea() { - return this.area; - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/ITileCacheFactory.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/ITileCacheFactory.java deleted file mode 100644 index 771f83c1d6..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/ITileCacheFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.view.cache; - -import org.jdesktop.swingx.mapviewer.TileCache; - -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; - -/** - * {@link TileCache} factory interface - * - * @author Simon Templer - */ -public interface ITileCacheFactory extends ExtensionObjectFactory { - - // concrete typed interface - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/ITileCacheService.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/ITileCacheService.java deleted file mode 100644 index 9a6ed85fdd..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/ITileCacheService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.view.cache; - -import org.jdesktop.swingx.mapviewer.TileCache; - -import de.fhg.igd.eclipse.util.extension.exclusive.ExclusiveExtension; - -/** - * {@link TileCache} extension service interface - * - * @author Simon Templer - */ -public interface ITileCacheService extends ExclusiveExtension { - - // concrete typed interface - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/TileCacheContribution.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/TileCacheContribution.java deleted file mode 100644 index 25b8e8ee51..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/TileCacheContribution.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.view.cache; - -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.mapviewer.TileCache; - -import de.fhg.igd.eclipse.ui.util.extension.AbstractExtensionContribution; -import de.fhg.igd.eclipse.ui.util.extension.exclusive.ExclusiveExtensionContribution; -import de.fhg.igd.eclipse.util.extension.exclusive.ExclusiveExtension; - -/** - * Contribution for selecting the {@link TileCache} - * - * @author Simon Templer - */ -public class TileCacheContribution - extends ExclusiveExtensionContribution { - - /** - * @see AbstractExtensionContribution#initExtension() - */ - @Override - protected ExclusiveExtension initExtension() { - return PlatformUI.getWorkbench().getService(ITileCacheService.class); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/TileCacheExtension.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/TileCacheExtension.java deleted file mode 100644 index 03e7e0e388..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/TileCacheExtension.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.view.cache; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.jdesktop.swingx.mapviewer.TileCache; - -import de.fhg.igd.eclipse.util.extension.AbstractConfigurationFactory; -import de.fhg.igd.eclipse.util.extension.AbstractExtension; -import de.fhg.igd.eclipse.util.extension.AbstractObjectDefinition; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; - -/** - * {@link TileCache} extension - * - * @author Simon Templer - */ -public class TileCacheExtension extends AbstractExtension { - - /** - * Default {@link TileCache} factory for configuration elements - */ - public class ConfigurationFactory extends AbstractConfigurationFactory - implements ITileCacheFactory { - - /** - * Constructor - * - * @param conf the configuration element - */ - public ConfigurationFactory(IConfigurationElement conf) { - super(conf, "class"); //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectFactory#dispose(Object) - */ - @Override - public void dispose(TileCache instance) { - instance.clear(); - } - - /** - * @see ExtensionObjectDefinition#getIdentifier() - */ - @Override - public String getIdentifier() { - return conf.getAttribute("id"); //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectDefinition#getDisplayName() - */ - @Override - public String getDisplayName() { - return conf.getAttribute("name"); //$NON-NLS-1$ - } - - /** - * @see AbstractObjectDefinition#getPriority() - */ - @Override - public int getPriority() { - String order = conf.getAttribute("order"); //$NON-NLS-1$ - if (order != null && !order.isEmpty()) { - return Integer.parseInt(order); - } - else { - return 0; - } - } - - } - - /** - * The extension ID - */ - public static final String ID = "de.fhg.igd.mapviewer.TileCache"; //$NON-NLS-1$ - - /** - * Default constructor - */ - public TileCacheExtension() { - super(ID); - } - - /** - * @see AbstractExtension#createFactory(IConfigurationElement) - */ - @Override - protected ITileCacheFactory createFactory(IConfigurationElement conf) throws Exception { - if (conf.getName().equals("cache")) { //$NON-NLS-1$ - return new ConfigurationFactory(conf); - } - - return null; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/TileCacheService.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/TileCacheService.java deleted file mode 100644 index d054585b41..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/TileCacheService.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.view.cache; - -import org.jdesktop.swingx.mapviewer.DefaultTileCache; -import org.jdesktop.swingx.mapviewer.TileCache; - -import de.fhg.igd.eclipse.ui.util.extension.exclusive.PreferencesExclusiveExtension; -import de.fhg.igd.eclipse.util.extension.AbstractObjectFactory; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; -import de.fhg.igd.mapviewer.view.MapviewerPlugin; -import de.fhg.igd.mapviewer.view.preferences.MapPreferenceConstants; - -/** - * *{@link TileCache} extension service - * - * @author Simon Templer - */ -public class TileCacheService extends PreferencesExclusiveExtension - implements ITileCacheService { - - /** - * {@link DefaultTileCache} factory for fallback - */ - public class DefaultFactory extends AbstractObjectFactory - implements ITileCacheFactory { - - /** - * @see ExtensionObjectFactory#createExtensionObject() - */ - @Override - public TileCache createExtensionObject() throws Exception { - return new DefaultTileCache(); - } - - /** - * @see ExtensionObjectFactory#dispose(Object) - */ - @Override - public void dispose(TileCache instance) { - instance.clear(); - } - - /** - * @see ExtensionObjectDefinition#getIdentifier() - */ - @Override - public String getIdentifier() { - return "de.fhg.igd.mapviewer.cache.default"; //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectDefinition#getDisplayName() - */ - @Override - public String getDisplayName() { - return "Default"; //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectDefinition#getTypeName() - */ - @Override - public String getTypeName() { - return DefaultTileCache.class.getName(); - } - - } - - /** - * Default constructor - */ - public TileCacheService() { - super(new TileCacheExtension(), MapviewerPlugin.getDefault().getPreferenceStore(), - MapPreferenceConstants.CACHE); - } - - /** - * @see PreferencesExclusiveExtension#getFallbackFactory() - */ - @Override - protected ITileCacheFactory getFallbackFactory() { - return new DefaultFactory(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/WorkspaceFileTileCache.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/WorkspaceFileTileCache.java deleted file mode 100644 index a98032ca57..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/cache/WorkspaceFileTileCache.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.view.cache; - -import java.io.File; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.osgi.service.datalocation.Location; - -import de.fhg.igd.mapviewer.cache.FileTileCache; - -/** - * {@link FileTileCache} with a predefined cache dir - * - * @author Simon Templer - */ -public class WorkspaceFileTileCache extends FileTileCache { - - /** - * Default constructor - */ - public WorkspaceFileTileCache() { - super(getCacheDir()); - } - - private static File getCacheDir() { - File dir = null; - - // determine main dir - - // instance location - Location instanceLoc = Platform.getInstanceLocation(); - if (instanceLoc != null) { - try { - dir = new File(instanceLoc.getURL().toURI()); - } catch (Throwable e) { - // ignore - } - } - - // temp dir - if (dir == null) { - String name = System.getProperty("java.io.tmpdir"); //$NON-NLS-1$ - dir = new File(name); - } - - dir = new File(dir, "tilecache"); //$NON-NLS-1$ - - return dir; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/messages.properties b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/messages.properties deleted file mode 100644 index b009598321..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/messages.properties +++ /dev/null @@ -1,2 +0,0 @@ -MapMenu_0=Overlays -MapMenu_1=Caching diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/IMapPainterService.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/IMapPainterService.java deleted file mode 100644 index 6975c7520c..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/IMapPainterService.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.overlay; - -import de.fhg.igd.eclipse.util.extension.selective.SelectiveExtension; -import de.fhg.igd.mapviewer.MapPainter; - -/** - * Service interface for managing the active {@link MapPainter}s - * - * @author Simon Templer - */ -public interface IMapPainterService extends SelectiveExtension { - - // concrete typed interface - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/ITileOverlayService.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/ITileOverlayService.java deleted file mode 100644 index 9cb6565c2c..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/ITileOverlayService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.overlay; - -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; - -import de.fhg.igd.eclipse.util.extension.selective.SelectiveExtension; - -/** - * Service interface for managing {@link TileOverlayPainter}s - * - * @author Simon Templer - */ -public interface ITileOverlayService - extends SelectiveExtension { - - // concrete typed interface - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/MapPainterContribution.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/MapPainterContribution.java deleted file mode 100644 index b71d9139a5..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/MapPainterContribution.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.overlay; - -import org.eclipse.ui.PlatformUI; - -import de.fhg.igd.eclipse.ui.util.extension.selective.SelectiveExtensionContribution; -import de.fhg.igd.eclipse.util.extension.selective.SelectiveExtension; -import de.fhg.igd.mapviewer.MapPainter; - -/** - * Contribution that represents and controls the activated {@link MapPainter}s - * - * @author Simon Templer - */ -public class MapPainterContribution - extends SelectiveExtensionContribution { - - /** - * @see SelectiveExtensionContribution#getExtension() - */ - @Override - protected SelectiveExtension initExtension() { - return PlatformUI.getWorkbench().getService(IMapPainterService.class); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/MapPainterExtension.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/MapPainterExtension.java deleted file mode 100644 index cb7d495f39..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/MapPainterExtension.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.overlay; - -import org.eclipse.core.runtime.IConfigurationElement; - -import de.fhg.igd.eclipse.util.extension.AbstractExtension; -import de.fhg.igd.mapviewer.MapPainter; - -/** - * {@link MapPainter} extension - * - * @author Simon Templer - */ -public class MapPainterExtension extends AbstractExtension { - - /** - * Default constructor - */ - public MapPainterExtension() { - super(MapPainter.class.getName()); - } - - /** - * @see AbstractExtension#createFactory(IConfigurationElement) - */ - @Override - protected MapPainterFactory createFactory(IConfigurationElement conf) throws Exception { - if (conf.getName().equals("painter")) { //$NON-NLS-1$ - return new MapPainterFactory(conf); - } - - return null; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/MapPainterFactory.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/MapPainterFactory.java deleted file mode 100644 index 46cf0832b9..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/MapPainterFactory.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.overlay; - -import org.eclipse.core.runtime.IConfigurationElement; - -import de.fhg.igd.eclipse.util.extension.AbstractConfigurationFactory; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; -import de.fhg.igd.mapviewer.MapPainter; - -/** - * Factory for a {@link MapPainter} - * - * @author Simon Templer - */ -public class MapPainterFactory extends AbstractConfigurationFactory { - - /** - * Constructor - * - * @param conf the configuration element - */ - protected MapPainterFactory(IConfigurationElement conf) { - super(conf, "class"); //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectDefinition#getDisplayName() - */ - @Override - public String getDisplayName() { - return conf.getAttribute("name"); //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectDefinition#getIdentifier() - */ - @Override - public String getIdentifier() { - return getTypeName(); - } - - /** - * @see ExtensionObjectFactory#dispose(Object) - */ - @Override - public void dispose(MapPainter instance) { - instance.dispose(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/MapPainterService.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/MapPainterService.java deleted file mode 100644 index 110c3097d8..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/MapPainterService.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.overlay; - -import de.fhg.igd.eclipse.ui.util.extension.selective.PreferencesSelectiveExtension; -import de.fhg.igd.mapviewer.MapPainter; -import de.fhg.igd.mapviewer.view.MapviewerPlugin; -import de.fhg.igd.mapviewer.view.preferences.MapPreferenceConstants; - -/** - * Service managing the active {@link MapPainter}s - * - * @author Simon Templer - */ -public class MapPainterService extends PreferencesSelectiveExtension - implements IMapPainterService { - - /** - * Default constructor - */ - public MapPainterService() { - super(new MapPainterExtension(), MapviewerPlugin.getDefault().getPreferenceStore(), - MapPreferenceConstants.ACTIVE_MAP_PAINTERS); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayContribution.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayContribution.java deleted file mode 100644 index 3094de694c..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayContribution.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.overlay; - -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; - -import de.fhg.igd.eclipse.ui.util.extension.selective.SelectiveExtensionContribution; -import de.fhg.igd.eclipse.util.extension.selective.SelectiveExtension; - -/** - * Contribution that represents and controls the active - * {@link TileOverlayPainter}s - * - * @author Simon Templer - */ -public class TileOverlayContribution - extends SelectiveExtensionContribution { - - /** - * @see SelectiveExtensionContribution#getExtension() - */ - @Override - protected SelectiveExtension initExtension() { - return PlatformUI.getWorkbench().getService(ITileOverlayService.class); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayExtension.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayExtension.java deleted file mode 100644 index 2bd4e26453..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayExtension.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.overlay; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; - -import de.fhg.igd.eclipse.util.extension.AbstractConfigurationFactory; -import de.fhg.igd.eclipse.util.extension.AbstractExtension; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection; -import de.fhg.igd.mapviewer.AbstractTileOverlayPainter; - -/** - * Tile overlay extension. - * - * @author Simon Templer - */ -public class TileOverlayExtension - extends AbstractExtension { - - /** - * {@link TileOverlayPainter} factory based on an - * {@link IConfigurationElement} - */ - public static class ConfigurationTileOverlayFactory - extends AbstractConfigurationFactoryimplements TileOverlayFactory { - - /** - * Constructor - * - * @param conf the configuration element - */ - protected ConfigurationTileOverlayFactory(IConfigurationElement conf) { - super(conf, "class"); //$NON-NLS-1$ - } - - /** - * @see AbstractConfigurationFactory#createExtensionObject() - */ - @Override - public TileOverlayPainter createExtensionObject() throws Exception { - TileOverlayPainter result = super.createExtensionObject(); - - try { - int priority = Integer.parseInt(conf.getAttribute("priority")); //$NON-NLS-1$ - - if (result instanceof AbstractTileOverlayPainter) { - ((AbstractTileOverlayPainter) result).setPriority(priority); - } - } catch (Exception e) { - // ignore - } - - return result; - } - - /** - * @see ExtensionObjectDefinition#getDisplayName() - */ - @Override - public String getDisplayName() { - return conf.getAttribute("name"); //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectDefinition#getIdentifier() - */ - @Override - public String getIdentifier() { - return conf.getAttribute("id"); //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectFactory#dispose(Object) - */ - @Override - public void dispose(TileOverlayPainter instance) { - instance.dispose(); - } - - /** - * @see TileOverlayFactory#showInMiniMap() - */ - @Override - public boolean showInMiniMap() { - return Boolean.parseBoolean(conf.getAttribute("showInMiniMap")); //$NON-NLS-1$ - } - - } - - /** - * Default constructor - */ - public TileOverlayExtension() { - super("de.fhg.igd.mapviewer.TileOverlayPainter"); //$NON-NLS-1$ - } - - /** - * @see AbstractExtension#createFactory(IConfigurationElement) - */ - @Override - protected TileOverlayFactory createFactory(IConfigurationElement conf) throws Exception { - if (conf.getName().equals("painter")) { //$NON-NLS-1$ - return new ConfigurationTileOverlayFactory(conf); - } - - return null; - } - - /** - * @see AbstractExtension#createCollection(org.eclipse.core.runtime.IConfigurationElement) - */ - @Override - protected ExtensionObjectFactoryCollection createCollection( - IConfigurationElement conf) throws Exception { - if (conf.getName().equals("collection")) { //$NON-NLS-1$ - TileOverlayFactoryCollection result = (TileOverlayFactoryCollection) conf - .createExecutableExtension("class"); //$NON-NLS-1$ - - try { - int priority = Integer.parseInt(conf.getAttribute("priority")); //$NON-NLS-1$ - - result.setPriority(priority); - } catch (Exception e) { - // ignore - } - - return result; - } - - return null; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayFactory.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayFactory.java deleted file mode 100644 index ebf8f41901..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayFactory.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.overlay; - -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; - -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; - -/** - * Factory interface for the {@link TileOverlayPainter} extension point - * - * @author Simon Templer - */ -public interface TileOverlayFactory extends ExtensionObjectFactory { - - /** - * Get if the painter shall be used for the mini map - * - * @return if the painter shall be used for the mini map - */ - public boolean showInMiniMap(); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayFactoryCollection.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayFactoryCollection.java deleted file mode 100644 index 4fefb1adcb..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayFactoryCollection.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.overlay; - -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; - -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection; - -/** - * Collection of tile overlay factories - * - * @author Simon Templer - */ -public interface TileOverlayFactoryCollection - extends ExtensionObjectFactoryCollection { - - /** - * Sets the painter priority - * - * @param priority the priority - */ - public void setPriority(int priority); - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayService.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayService.java deleted file mode 100644 index 1d95b939e0..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/overlay/TileOverlayService.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.overlay; - -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; - -import de.fhg.igd.eclipse.ui.util.extension.selective.PreferencesSelectiveExtension; -import de.fhg.igd.mapviewer.view.MapviewerPlugin; -import de.fhg.igd.mapviewer.view.preferences.MapPreferenceConstants; - -/** - * Tile overlay service. - * - * @author Simon Templer - */ -public class TileOverlayService - extends PreferencesSelectiveExtension - implements ITileOverlayService { - - /** - * Default constructor - */ - public TileOverlayService() { - super(new TileOverlayExtension(), MapviewerPlugin.getDefault().getPreferenceStore(), - MapPreferenceConstants.ACTIVE_TILE_OVERLAYS); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/preferences/MapPreferenceConstants.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/preferences/MapPreferenceConstants.java deleted file mode 100644 index 4857984c79..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/preferences/MapPreferenceConstants.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.preferences; - -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; - -import de.fhg.igd.mapviewer.MapPainter; -import de.fhg.igd.mapviewer.server.MapServer; - -/** - * Preference constants - * - * @author Simon Templer - */ -public interface MapPreferenceConstants { - - /** - * The active {@link MapPainter}s - */ - public static final String ACTIVE_MAP_PAINTERS = "map.active.map_painters"; //$NON-NLS-1$ - - /** - * The {@link TileCache} to use - */ - public static final String CACHE = "map.cache"; //$NON-NLS-1$ - - /** - * The active {@link TileOverlayPainter}s - */ - public static final String ACTIVE_TILE_OVERLAYS = "map.active.tile_overlays"; //$NON-NLS-1$ - - /** - * The current {@link MapServer} - */ - public static final String CURRENT_MAP_SERVER = "map.current.map_server"; //$NON-NLS-1$ - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/preferences/MapPreferenceInitializer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/preferences/MapPreferenceInitializer.java deleted file mode 100644 index 1220e7ce72..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/preferences/MapPreferenceInitializer.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.preferences; - -import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.jface.preference.IPreferenceStore; - -import de.fhg.igd.eclipse.ui.util.extension.selective.PreferencesSelectiveExtension; -import de.fhg.igd.mapviewer.view.MapviewerPlugin; - -/** - * Map preferences initializer. - * - * @author Simon Templer - */ -public class MapPreferenceInitializer extends AbstractPreferenceInitializer { - - /** - * @see AbstractPreferenceInitializer#initializeDefaultPreferences() - */ - @Override - public void initializeDefaultPreferences() { - IPreferenceStore store = MapviewerPlugin.getDefault().getPreferenceStore(); - - store.setDefault(MapPreferenceConstants.ACTIVE_MAP_PAINTERS, - PreferencesSelectiveExtension.PREFERENCE_ALL); - - store.setDefault(MapPreferenceConstants.ACTIVE_TILE_OVERLAYS, - PreferencesSelectiveExtension.PREFERENCE_ALL); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/ConfigurationMapServerFactory.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/ConfigurationMapServerFactory.java deleted file mode 100644 index 21065e6800..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/ConfigurationMapServerFactory.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.server; - -import org.apache.commons.beanutils.BeanUtils; -import org.eclipse.core.runtime.IConfigurationElement; - -import de.fhg.igd.eclipse.util.extension.AbstractConfigurationFactory; -import de.fhg.igd.eclipse.util.extension.AbstractObjectDefinition; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; -import de.fhg.igd.mapviewer.server.MapServer; -import de.fhg.igd.mapviewer.server.MapServerFactory; - -/** - * {@link MapServer} factory based on an {@link IConfigurationElement} - * - * @author Simon Templer - */ -public class ConfigurationMapServerFactory extends AbstractConfigurationFactory - implements MapServerFactory { - - /** - * @param config the configuration element - */ - ConfigurationMapServerFactory(IConfigurationElement config) { - super(config, "class"); //$NON-NLS-1$ - } - - /** - * @see AbstractConfigurationFactory#createExtensionObject() - */ - @Override - public MapServer createExtensionObject() throws Exception { - MapServer server = super.createExtensionObject(); - - // set name - server.setName(getDisplayName()); - - // configure map server - IConfigurationElement[] properties = conf.getChildren(); - for (IConfigurationElement property : properties) { - String name = property.getAttribute("name"); //$NON-NLS-1$ - String value = property.getAttribute("value"); //$NON-NLS-1$ - BeanUtils.setProperty(server, name, value); - } - - return server; - } - - /** - * @see ExtensionObjectDefinition#getDisplayName() - */ - @Override - public String getDisplayName() { - return conf.getAttribute("name"); //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectDefinition#getIdentifier() - */ - @Override - public String getIdentifier() { - return getTypeName() + ":" + getDisplayName(); //$NON-NLS-1$ - } - - /** - * @see ExtensionObjectFactory#dispose(Object) - */ - @Override - public void dispose(MapServer instance) { - instance.cleanup(); - } - - /** - * @see AbstractObjectDefinition#getPriority() - */ - @Override - public int getPriority() { - try { - return Integer.valueOf(conf.getAttribute("priority")); //$NON-NLS-1$ - } catch (NumberFormatException e) { - return 0; // default - } - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/IMapServerService.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/IMapServerService.java deleted file mode 100644 index 384f68d30d..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/IMapServerService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.server; - -import de.fhg.igd.eclipse.util.extension.exclusive.ExclusiveExtension; -import de.fhg.igd.mapviewer.server.MapServer; -import de.fhg.igd.mapviewer.server.MapServerFactory; - -/** - * Service interface for managing the current {@link MapServer} - * - * @author Simon Templer - */ -public interface IMapServerService extends ExclusiveExtension { - - // concrete typed interface - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/MapServerContribution.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/MapServerContribution.java deleted file mode 100644 index ff54068ce1..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/MapServerContribution.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.server; - -import org.eclipse.ui.PlatformUI; - -import de.fhg.igd.eclipse.ui.util.extension.exclusive.ExclusiveExtensionContribution; -import de.fhg.igd.eclipse.util.extension.exclusive.ExclusiveExtension; -import de.fhg.igd.mapviewer.server.MapServer; -import de.fhg.igd.mapviewer.server.MapServerFactory; - -/** - * Contribution that represents and controls the current {@link MapServer} - * - * @author Simon Templer - */ -public class MapServerContribution - extends ExclusiveExtensionContribution { - - /** - * @see ExclusiveExtensionContribution#getExtension() - */ - @Override - protected ExclusiveExtension initExtension() { - return PlatformUI.getWorkbench().getService(IMapServerService.class); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/MapServerExtension.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/MapServerExtension.java deleted file mode 100644 index e139a28683..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/MapServerExtension.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.server; - -import org.eclipse.core.runtime.IConfigurationElement; - -import de.fhg.igd.eclipse.util.extension.AbstractExtension; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection; -import de.fhg.igd.mapviewer.server.MapServer; -import de.fhg.igd.mapviewer.server.MapServerFactory; -import de.fhg.igd.mapviewer.server.MapServerFactoryCollection; - -/** - * Represents the {@link MapServer} extensions - * - * @author Simon Templer - */ -public class MapServerExtension extends AbstractExtension { - - /** - * Default constructor - */ - public MapServerExtension() { - super(MapServer.class.getName()); - } - - /** - * @see AbstractExtension#createFactory(IConfigurationElement) - */ - @Override - protected MapServerFactory createFactory(IConfigurationElement conf) throws Exception { - - if (conf.getName().equals("server")) { //$NON-NLS-1$ - return new ConfigurationMapServerFactory(conf); - } - - return null; - } - - /** - * @see AbstractExtension#createCollection(IConfigurationElement) - */ - @Override - protected ExtensionObjectFactoryCollection createCollection( - IConfigurationElement conf) throws Exception { - if (conf.getName().equals("collection")) { //$NON-NLS-1$ - return (MapServerFactoryCollection) conf.createExecutableExtension("class"); //$NON-NLS-1$ - } - - return null; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/MapServerService.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/MapServerService.java deleted file mode 100644 index 24ed3e5c62..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/view/server/MapServerService.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.view.server; - -import java.util.List; - -import de.fhg.igd.eclipse.ui.util.extension.exclusive.PreferencesExclusiveExtension; -import de.fhg.igd.eclipse.util.extension.AbstractObjectFactory; -import de.fhg.igd.mapviewer.server.EmptyMapServer; -import de.fhg.igd.mapviewer.server.MapServer; -import de.fhg.igd.mapviewer.server.MapServerFactory; -import de.fhg.igd.mapviewer.view.MapviewerPlugin; -import de.fhg.igd.mapviewer.view.preferences.MapPreferenceConstants; - -/** - * Service managing the current {@link MapServer} - * - * @author Simon Templer - */ -public class MapServerService extends PreferencesExclusiveExtension - implements IMapServerService { - - /** - * Empty map server factory - */ - public static class EmptyMapFactory extends AbstractObjectFactory - implements MapServerFactory { - - @Override - public String getTypeName() { - return EmptyMapServer.class.getName(); - } - - @Override - public String getIdentifier() { - return getTypeName() + ":" + getDisplayName(); //$NON-NLS-1$ - } - - @Override - public String getDisplayName() { - return "Dummy"; //$NON-NLS-1$ - } - - @Override - public MapServer createExtensionObject() throws Exception { - MapServer server = new EmptyMapServer(); - server.setName(getDisplayName()); - return server; - } - - @Override - public void dispose(MapServer instance) { - instance.cleanup(); - } - - } - - /** - * Default constructor - */ - public MapServerService() { - super(new MapServerExtension(), MapviewerPlugin.getDefault().getPreferenceStore(), - MapPreferenceConstants.CURRENT_MAP_SERVER); - // Loading map again with new changes - setAllowReactivation(true); - } - - /** - * @see PreferencesExclusiveExtension#getFallbackFactory() - */ - @Override - protected MapServerFactory getFallbackFactory() { - return new EmptyMapFactory(); - } - - /** - * @see PreferencesExclusiveExtension#getDefaultFactory(List) - */ - @Override - protected MapServerFactory getDefaultFactory(List factories) { - // return the factory with the highest priority - MapServerFactory result = null; - - for (MapServerFactory factory : factories) { - if (result == null) { - result = factory; - } - else { - if (factory.getPriority() < result.getPriority()) { - result = factory; - } - } - } - - return result; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/CustomWaypointPainter.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/CustomWaypointPainter.java deleted file mode 100644 index 10f3900139..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/CustomWaypointPainter.java +++ /dev/null @@ -1,602 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.waypoints; - -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.Point; -import java.awt.Polygon; -import java.awt.Rectangle; -import java.awt.geom.Point2D; -import java.awt.image.BufferedImage; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.PixelConverter; -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; -import org.jdesktop.swingx.mapviewer.TileProviderUtils; - -import de.fhg.igd.geom.BoundingBox; -import de.fhg.igd.geom.Verifier; -import de.fhg.igd.geom.indices.RTree; -import de.fhg.igd.mapviewer.AbstractTileOverlayPainter; -import de.fhg.igd.mapviewer.MapKitTileOverlayPainter; -import de.fhg.igd.mapviewer.Refresher; -import de.fhg.igd.mapviewer.marker.area.Area; - -/** - * CustomWaypointPainter - * - * Based on the implementation of the WaypointPainter class - * - * @param the way-point type - * @author Simon Templer - * @version $Id$ - */ -public abstract class CustomWaypointPainter> - extends MapKitTileOverlayPainter { - - private static final Log log = LogFactory.getLog(CustomWaypointPainter.class); - - private WaypointRenderer renderer; - - private static final int PAGE_SIZE = 32; - - private final RTree waypoints = new RTree(PAGE_SIZE); - - private final Verifier matchTileVerifier = new Verifier, BoundingBox>() { - - @Override - public boolean verify(SelectableWaypoint first, BoundingBox second) { - return second.intersectsOrCovers(first.getBoundingBox()); - } - }; - - /** - * Way-points with a big area (bounding box) are painted first, selected - * way-points are painted last - */ - private final Comparator paintFirstComparator = new Comparator() { - - @Override - public int compare(W o1, W o2) { - // selected come last - if (o1.isSelected() && !o2.isSelected()) { - return 1; - } - else if (o2.isSelected() && !o1.isSelected()) { - return -1; - } - else { - double a1 = (o1.isPoint()) ? (0) - : (o1.getBoundingBox().getWidth() * o1.getBoundingBox().getHeight()); - double a2 = (o2.isPoint()) ? (0) - : (o2.getBoundingBox().getWidth() * o2.getBoundingBox().getHeight()); - - int areaHint = 0; - // compare size - if (a1 > a2) { - areaHint = -1; - } - else if (a2 > a1) { - areaHint = 1; - } - - return areaHint; - } - } - - }; - - /** - * Creates a custom way-point painter that uses markers for painting - */ - public CustomWaypointPainter() { - this(new MarkerWaypointRenderer()); - } - - /** - * Creates a new instance of CustomWaypointPainter with one worker thread - * for painting tiles. - * - * @param renderer the way-point renderer - */ - public CustomWaypointPainter(WaypointRenderer renderer) { - this(renderer, 1); - } - - /** - * Creates a new instance of CustomWaypointPainter. - * - * @param renderer the way-point renderer - * @param numberOfThreads the number of worker threads to use for painting - * tiles - */ - public CustomWaypointPainter(WaypointRenderer renderer, int numberOfThreads) { - super(numberOfThreads); - - setRenderer(renderer); - } - - /** - * Sets the way-point renderer to use when painting way-points - * - * @param renderer the new CustomWaypointRenderer to use - */ - public void setRenderer(WaypointRenderer renderer) { - this.renderer = renderer; - } - - /** - * Add a way-point - * - * @param wp the way-point - * @param refresh the refresher - */ - public void addWaypoint(W wp, Refresher refresh) { - BoundingBox bb = wp.getBoundingBox(); - - if (bb != null) { - synchronized (waypoints) { - waypoints.insert(wp); - } - - if (refresh != null) { - wp.addToRefresher(refresh); - } - } - } - - /** - * Remove a way-point - * - * @param wp the way-point - * @param refresh the refresher - */ - public void removeWaypoint(W wp, Refresher refresh) { - synchronized (waypoints) { - waypoints.delete(wp); - } - - if (refresh != null) { - wp.addToRefresher(refresh); - } - } - - /** - * @see AbstractTileOverlayPainter#repaintTile(int, int, int, int, - * PixelConverter, int) - */ - @Override - public BufferedImage repaintTile(int posX, int posY, int width, int height, - PixelConverter converter, int zoom) { - if (renderer == null) { - return null; - } - - int overlap = getMaxOverlap(); - - // overlap pixel coordinates - Point topLeftPixel = new Point(Math.max(posX - overlap, 0), Math.max(posY - overlap, 0)); - Point bottomRightPixel = new Point(posX + width + overlap, posY + height + overlap); // TODO - // check - // against - // map - // size - - // overlap geo positions - GeoPosition topLeft = converter.pixelToGeo(topLeftPixel, zoom); - GeoPosition bottomRight = converter.pixelToGeo(bottomRightPixel, zoom); - - // overlap geo positions in RTree CRS - try { - BoundingBox tileBounds = createSearchBB(topLeft, bottomRight); - - synchronized (waypoints) { - Set candidates = waypoints.query(tileBounds, matchTileVerifier); - - if (candidates != null) { - // sort way-points - List sorted = new ArrayList(candidates); - Collections.sort(sorted, paintFirstComparator); - - BufferedImage image = createImage(width, height); - Graphics2D gfx = image.createGraphics(); - configureGraphics(gfx); - - try { - // for each way-point within these bounds - for (W w : sorted) { - processWaypoint(w, posX, posY, width, height, converter, zoom, gfx); - } - - /* - * DEBUG String test = getClass().getSimpleName() + - * " - x=" + posX + ", y=" + posY + ": " + - * candidates.size() + " WPs"; gfx.setColor(Color.BLUE); - * gfx.drawString(test, 4, height - 4); - * - * gfx.drawString("minX: " + tileBounds.getMinX(), 4, - * height - 84); gfx.drawString("maxX: " + - * tileBounds.getMaxX(), 4, height - 64); - * gfx.drawString("minY: " + tileBounds.getMinY(), 4, - * height - 44); gfx.drawString("maxY: " + - * tileBounds.getMaxY(), 4, height - 24); - * - * gfx.drawRect(0, 0, width - 1, height - 1); - */ - } finally { - gfx.dispose(); - } - - return image; - } - else { - return null; - } - } - } catch (IllegalGeoPositionException e) { - log.warn("Error painting waypoint tile: " + e.getMessage()); //$NON-NLS-1$ - return null; - } - } - - /** - * Create a search bounding box - * - * @param topLeft the first geo-position - * @param bottomRight the second geo-position - * @return the bounding box - * - * @throws IllegalGeoPositionException if a conversion fails - */ - private BoundingBox createSearchBB(GeoPosition topLeft, GeoPosition bottomRight) - throws IllegalGeoPositionException { - topLeft = GeotoolsConverter.getInstance().convert(topLeft, SelectableWaypoint.COMMON_EPSG); - bottomRight = GeotoolsConverter.getInstance().convert(bottomRight, - SelectableWaypoint.COMMON_EPSG); - - return new BoundingBox(Math.min(bottomRight.getX(), topLeft.getX()), - Math.min(bottomRight.getY(), topLeft.getY()), -2.0, - Math.max(bottomRight.getX(), topLeft.getX()), - Math.max(bottomRight.getY(), topLeft.getY()), 2.0); - } - - private void processWaypoint(W w, int minX, int minY, int width, int height, - PixelConverter converter, int zoom, Graphics2D g) { - try { - Point2D point = converter.geoToPixel(w.getPosition(), zoom); - int x = (int) (point.getX() - minX); - int y = (int) (point.getY() - minY); - PixelConverter converterWrapper = new TranslationPixelConverterDecorator(converter, - (int) point.getX(), (int) point.getY()); - g.translate(x, y); - Rectangle gBounds = new Rectangle(minX - (int) point.getX(), minY - (int) point.getY(), - width, height); - renderer.paintWaypoint(g, converterWrapper, zoom, w, gBounds); - g.translate(-x, -y); - } catch (IllegalGeoPositionException e) { - // waypoint not in map bounds or position invalid - // log.warn("Error painting waypoint", e); - } - } - - /** - * Find a way-point at a given position - * - * @param point the position - * @return the way-point - */ - public W findWaypoint(Point point) { - Rectangle viewPort = getMapKit().getMainMap().getViewportBounds(); - - final int overlap = getMaxOverlap(); // the overlap is the reason why - // the point is used instead of - // a GeoPosition - - final int x = viewPort.x + point.x; - final int y = viewPort.y + point.y; - final int zoom = getMapKit().getMainMap().getZoom(); - final PixelConverter converter = getMapKit().getMainMap().getTileFactory().getTileProvider() - .getConverter(); - - final Dimension mapSize = TileProviderUtils - .getMapSize(getMapKit().getMainMap().getTileFactory().getTileProvider(), zoom); - final int width = mapSize.width - * getMapKit().getMainMap().getTileFactory().getTileProvider().getTileWidth(zoom); - final int height = mapSize.height - * getMapKit().getMainMap().getTileFactory().getTileProvider().getTileHeight(zoom); - - final GeoPosition topLeft = converter - .pixelToGeo(new Point(Math.max(x - overlap, 0), Math.max(y - overlap, 0)), zoom); - final GeoPosition bottomRight = converter.pixelToGeo( - new Point(Math.min(x + overlap, width), Math.min(y + overlap, height)), zoom); - - BoundingBox searchBox; - try { - searchBox = createSearchBB(topLeft, bottomRight); - - Set wps = waypoints.query(searchBox, new Verifier() { - - @Override - public boolean verify(W wp, BoundingBox box) { - try { - Point2D wpPixel = converter.geoToPixel(wp.getPosition(), zoom); - - int relX = x - (int) wpPixel.getX(); - int relY = y - (int) wpPixel.getY(); - - Area area = wp.getMarker().getArea(zoom); - if (area != null && area.contains(relX, relY)) { - // match - return true; - } - } catch (IllegalGeoPositionException e) { - log.debug("Error converting waypoint position", e); //$NON-NLS-1$ - } - - return false; - } - }); - - if (wps == null || wps.isEmpty()) { - return null; - } - else { - if (wps.size() == 1) { - return wps.iterator().next(); - } - else { - List sorted = new ArrayList(wps); - Collections.sort(sorted, new Comparator() { - - @Override - public int compare(W o1, W o2) { - double a1 = o1.getMarker().getArea(zoom).getArea(); - double a2 = o2.getMarker().getArea(zoom).getArea(); - - // compare size - if (a1 < a2) { - return -1; - } - else if (a2 < a1) { - return 1; - } - else { - return 0; - } - } - - }); - return sorted.get(0); - } - } - } catch (IllegalGeoPositionException e) { - return null; - } - } - - /** - * Find the way-points in a given rectangular area - * - * @param rect the area - * @return the way-points in the area - */ - public Set findWaypoints(Rectangle rect) { - Rectangle viewPort = getMapKit().getMainMap().getViewportBounds(); - - final Rectangle worldRect = new Rectangle(viewPort.x + rect.x, viewPort.y + rect.y, - rect.width, rect.height); - - final int zoom = getMapKit().getMainMap().getZoom(); - final PixelConverter converter = getMapKit().getMainMap().getTileFactory().getTileProvider() - .getConverter(); - - final GeoPosition topLeft = converter.pixelToGeo(new Point(worldRect.x, worldRect.y), zoom); - final GeoPosition bottomRight = converter.pixelToGeo( - (new Point(worldRect.x + worldRect.width, worldRect.y + worldRect.height)), zoom); - - return findWaypoints(topLeft, bottomRight, worldRect, converter, zoom); - } - - /** - * Find way-points in a rectangular area defined by the given - * {@link GeoPosition}s - * - * @param topLeft the top left position - * @param bottomRight the bottom right position - * @param worldRect the bounding box in world pixel coordinates - * @param converter the pixel converter - * @param zoom the zoom level - * - * @return the way-points in the area - */ - public Set findWaypoints(GeoPosition topLeft, GeoPosition bottomRight, - final Rectangle worldRect, final PixelConverter converter, final int zoom) { - BoundingBox searchBox; - try { - searchBox = createSearchBB(topLeft, bottomRight); - final BoundingBox verifyBox = searchBox; - - Set wps = waypoints.query(searchBox, new Verifier() { - - @Override - public boolean verify(W wp, BoundingBox second) { - try { - Point2D wpPixel = converter.geoToPixel(wp.getPosition(), zoom); - int dx = (int) wpPixel.getX(); - int dy = (int) wpPixel.getY(); - - worldRect.translate(-dx, -dy); - try { - Area area = wp.getMarker().getArea(zoom); - if (area != null) { - return area.containedIn(worldRect); - } - else { - // something that has not been painted yet may - // not be selected - return false; - } - } finally { - worldRect.translate(dx, dy); - } - } catch (IllegalGeoPositionException e) { - log.warn("Could not convert waypoint position to pixel", e); - // fall back to simple method - return verifyBox.covers(wp.getBoundingBox()); - } - } - - }); - - if (wps == null) { - return new HashSet(); - } - else { - return wps; - } - } catch (IllegalGeoPositionException e) { - return new HashSet(); - } - } - - /** - * Find the way-points in a given polygon - * - * @param poly the polygon - * @return the way-points in the polygon area - */ - public Set findWaypoints(final Polygon poly) { - Rectangle viewPort = getMapKit().getMainMap().getViewportBounds(); - - final int zoom = getMapKit().getMainMap().getZoom(); - final PixelConverter converter = getMapKit().getMainMap().getTileFactory().getTileProvider() - .getConverter(); - - de.fhg.igd.geom.Point2D[] points = new de.fhg.igd.geom.Point2D[poly.npoints]; - - // create a metamodel polygon - for (int i = 0; i < poly.npoints; i++) { - int worldX = viewPort.x + poly.xpoints[i]; - int worldY = viewPort.y + poly.ypoints[i]; - - // convert to geo position - GeoPosition pos = converter.pixelToGeo(new Point(worldX, worldY), zoom); - - // convert to common CRS - try { - pos = GeotoolsConverter.getInstance().convert(pos, SelectableWaypoint.COMMON_EPSG); - } catch (IllegalGeoPositionException e) { - log.warn("Error converting polygon point for query"); //$NON-NLS-1$ - return new HashSet(); - } - - points[i] = new de.fhg.igd.geom.Point2D(pos.getX(), pos.getY()); - } - - final de.fhg.igd.geom.shape.Polygon verifyPolygon = new de.fhg.igd.geom.shape.Polygon( - points); - - // we need a 3D search bounding box for the R-Tree - BoundingBox searchBox = verifyPolygon.getBoundingBox(); - searchBox.setMinZ(-2.0); - searchBox.setMaxZ(2.0); - - poly.translate(viewPort.x, viewPort.y); - try { - Set wps = waypoints.query(searchBox, new Verifier() { - - @Override - public boolean verify(W wp, BoundingBox second) { - try { - Point2D wpPixel = converter.geoToPixel(wp.getPosition(), zoom); - int dx = (int) wpPixel.getX(); - int dy = (int) wpPixel.getY(); - - poly.translate(-dx, -dy); - try { - Area area = wp.getMarker().getArea(zoom); - if (area != null) { - return area.containedIn(poly); - } - else { - // something that has not been painted yet may - // not be selected - return false; - } - } finally { - poly.translate(dx, dy); - } - } catch (IllegalGeoPositionException e) { - log.warn("Could not convert waypoint position to pixel", e); - // fall back to simple method - return verifyPolygon.contains(wp.getBoundingBox().toExtent()); - } - } - - }); - - if (wps == null) { - return new HashSet(); - } - else { - return wps; - } - } finally { - poly.translate(-viewPort.x, -viewPort.y); - } - } - - /** - * Clear the way-points - */ - public void clearWaypoints() { - synchronized (waypoints) { - waypoints.flush(); - } - - refreshAll(); - } - - /** - * @see TileOverlayPainter#dispose() - */ - @Override - public void dispose() { - clearWaypoints(); - - super.dispose(); - } - - /** - * Get the way-points bounding box. - * - * @return the bounding box - */ - public BoundingBox getBoundingBox() { - return waypoints.getRoot().getBoundingBox(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/DrawWaypoint.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/DrawWaypoint.java deleted file mode 100644 index af4f08170b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/DrawWaypoint.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.waypoints; - -import java.awt.Graphics2D; - -import org.jdesktop.swingx.mapviewer.Waypoint; - -/** - * DrawWaypoint - * - * @param the way-point type - * @author Simon Templer - * @version $Id$ - */ -public class DrawWaypoint { - - private final W wp; - - private final Graphics2D g; - - /** - * Constructor - * - * @param wp the way-point - * @param g the graphics - */ - public DrawWaypoint(W wp, Graphics2D g) { - this.wp = wp; - this.g = g; - } - - /** - * @return the wp - */ - public W getWaypoint() { - return wp; - } - - /** - * @return the g - */ - public Graphics2D getGraphics() { - return g; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/GenericWaypoint.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/GenericWaypoint.java deleted file mode 100644 index a384af378c..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/GenericWaypoint.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.waypoints; - -import org.jdesktop.swingx.mapviewer.GeoPosition; - -import de.fhg.igd.geom.BoundingBox; - -/** - * GenericWaypoint - * - * @param the value type - * @author Simon Templer - * @version $Id$ - * @param the way-point type - */ -public class GenericWaypoint> extends SelectableWaypoint { - - private final T value; - - /** - * Constructor - * - * @param pos the way-point position - * @param bb the bounding box, may be null - * @param value the value - */ - public GenericWaypoint(GeoPosition pos, BoundingBox bb, T value) { - super(pos, bb); - - this.value = value; - } - - /** - * @return the value - */ - public T getValue() { - return value; - } - - /** - * @see Object#toString() - */ - @Override - public String toString() { - return getValue().toString(); - } - - /** - * @see Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((value == null) ? 0 : value.hashCode()); - return result; - } - - /** - * @see Object#equals(Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - GenericWaypoint other = (GenericWaypoint) obj; - if (value == null) { - if (other.value != null) - return false; - } - else if (!value.equals(other.value)) - return false; - return true; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/GenericWaypointPainter.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/GenericWaypointPainter.java deleted file mode 100644 index bf96082e84..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/GenericWaypointPainter.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.waypoints; - -import java.util.HashMap; -import java.util.Map; - -import de.fhg.igd.mapviewer.Refresher; - -/** - * GenericWaypointPainter - * - * @param the way-point value type - * @author Simon Templer - * @version $Id$ - * @param the way-point type - */ -public abstract class GenericWaypointPainter> - extends CustomWaypointPainter { - - private final Map waypointMap = new HashMap(); - - /** - * @see CustomWaypointPainter#CustomWaypointPainter() - */ - public GenericWaypointPainter() { - super(); - } - - /** - * @see CustomWaypointPainter#CustomWaypointPainter(WaypointRenderer, int) - */ - public GenericWaypointPainter(WaypointRenderer renderer, int numberOfThreads) { - super(renderer, numberOfThreads); - } - - /** - * @see CustomWaypointPainter#CustomWaypointPainter(WaypointRenderer) - */ - public GenericWaypointPainter(WaypointRenderer renderer) { - super(renderer); - } - - /** - * @see CustomWaypointPainter#addWaypoint(SelectableWaypoint, Refresher) - */ - @Override - public void addWaypoint(W wp, Refresher refresh) { - W previous = waypointMap.put(wp.getValue(), wp); - if (previous != null) { - // remove way-point previously associated with the object - // (because the RTree doesn't know if there are duplicates) - removeWaypoint(previous, refresh); - } - - super.addWaypoint(wp, refresh); - } - - /** - * @see CustomWaypointPainter#clearWaypoints() - */ - @Override - public void clearWaypoints() { - super.clearWaypoints(); - waypointMap.clear(); - } - - /** - * Remove a way-point - * - * @param object the object associated with the way-point - * @param refresh the refresher - */ - protected void removeWaypoint(T object, Refresher refresh) { - if (waypointMap.containsKey(object)) { - W wp = waypointMap.get(object); - super.removeWaypoint(wp, refresh); - waypointMap.remove(object); - } - } - - /** - * Find the way-point associated with the given object - * - * @param object the object - * @return the way-point or null if no way-point is associated - * with the object - */ - protected W findWaypoint(T object) { - return waypointMap.get(object); - } - - /** - * {@link Iterable} over the way-points - * - * @return all way-points - */ - protected Iterable iterateWaypoints() { - return waypointMap.values(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/MarkerWaypointRenderer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/MarkerWaypointRenderer.java deleted file mode 100644 index 9543c9e0d8..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/MarkerWaypointRenderer.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.waypoints; - -import java.awt.Graphics2D; -import java.awt.Rectangle; - -import org.jdesktop.swingx.mapviewer.PixelConverter; -import org.jdesktop.swingx.mapviewer.Waypoint; - -import de.fhg.igd.mapviewer.marker.area.Area; - -/** - * Waypoint renderer using markers. - * - * @param the way-point type - * @author Simon Templer - */ -public class MarkerWaypointRenderer> - implements WaypointRenderer { - - /** - * @see WaypointRenderer#paintWaypoint(Graphics2D, PixelConverter, int, - * Waypoint, Rectangle) - */ - @Override - public Area paintWaypoint(Graphics2D g, PixelConverter converter, int zoom, W w, - Rectangle gBounds) { - - w.getMarker().paint(g, converter, zoom, w, gBounds); - - return w.getMarker().getArea(zoom); - } -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/SelectableWaypoint.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/SelectableWaypoint.java deleted file mode 100644 index 4eedf78e0e..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/SelectableWaypoint.java +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.waypoints; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.Waypoint; - -import de.fhg.igd.geom.BoundingBox; -import de.fhg.igd.geom.Localizable; -import de.fhg.igd.mapviewer.Refresher; -import de.fhg.igd.mapviewer.marker.Marker; - -/** - * SelectableWaypoint - * - * @author Simon Templer - * - * @version $Id$ - * @param the way-point type - */ -public class SelectableWaypoint> extends Waypoint - implements Localizable { - - private static final Log log = LogFactory.getLog(SelectableWaypoint.class); - - /** - * The EPSG code of the SRS used for the bounding box - */ - public static final int COMMON_EPSG = 3395; // WGS 84 / World Mercator - // 4326; // WGS 84 - // 4087; // WGS 84 / World Equidistant Cylindrical - - private static final double POSITION_EXPAND = 0.125; - // 1e-8; - - private boolean selected = false; - - private BoundingBox box = null; - - /** - * States if the way-point only represents a point (instead of a larger - * geometry) - */ - private boolean point; - - private Marker marker; - - /** - * Constructor - * - * @param x the x ordinate - * @param y the y ordinate - * @param epsg the EPSG code - * @param bb the bounding box, may be null - */ - public SelectableWaypoint(double x, double y, int epsg, BoundingBox bb) { - super(x, y, epsg); - - if (bb != null && bb.checkIntegrity()) { - this.box = bb; - this.point = false; - } - else { - this.point = true; - } - } - - /** - * Constructor - * - * @param coord the position of the way-point - * @param bb the bounding box, may be null - */ - public SelectableWaypoint(GeoPosition coord, BoundingBox bb) { - super(coord); - - if (bb != null && bb.checkIntegrity()) { - this.box = bb; - this.point = false; - } - else { - this.point = true; - } - } - - /** - * @return the point - */ - public boolean isPoint() { - return point; - } - - /** - * @see Waypoint#setPosition(GeoPosition) - */ - @Override - public void setPosition(GeoPosition coordinate) { - super.setPosition(coordinate); - - box = null; - } - - /** - * @return the selected - */ - public boolean isSelected() { - return selected; - } - - /** - * Set if the way-point is selected - * - * @param selected if the way-point is selected - * @param refresh the refresher - */ - public void setSelected(boolean selected, Refresher refresh) { - this.selected = selected; - - if (refresh != null) { - addToRefresher(refresh); - } - } - - /** - * Add a way-point to the refresher - * - * @param refresher the refresher - */ - public void addToRefresher(Refresher refresher) { - if (isPoint()) { - refresher.addPosition(getPosition()); - } - else { - BoundingBox bb = getBoundingBox(); - GeoPosition bottomRight = new GeoPosition(bb.getMaxX(), bb.getMaxY(), COMMON_EPSG); - GeoPosition topLeft = new GeoPosition(bb.getMinX(), bb.getMinY(), COMMON_EPSG); - refresher.addArea(topLeft, bottomRight); - } - } - - /** - * @return the marker - */ - public Marker getMarker() { - return marker; - } - - /** - * @param marker the marker to set - */ - public void setMarker(Marker marker) { - this.marker = marker; - } - - /** - * @see Localizable#getBoundingBox() - */ - @Override - public BoundingBox getBoundingBox() { - if (box == null) { - GeoPosition pos; - try { - pos = GeotoolsConverter.getInstance().convert(getPosition(), COMMON_EPSG); - box = new BoundingBox(pos.getX() - POSITION_EXPAND, pos.getY() - POSITION_EXPAND, - 0.0, pos.getX() + POSITION_EXPAND, pos.getY() + POSITION_EXPAND, 1.0); - } catch (IllegalGeoPositionException e) { - log.warn("Error creating bounding box for waypoint"); //$NON-NLS-1$ - } - } - - return box; - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/TranslationPixelConverterDecorator.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/TranslationPixelConverterDecorator.java deleted file mode 100644 index be525c516b..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/TranslationPixelConverterDecorator.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.mapviewer.waypoints; - -import java.awt.Point; -import java.awt.geom.Point2D; - -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.PixelConverter; - -/** - * Pixel converter that supports a translation to a custom pixel coordinates - * origin - * - * @author Simon Templer - */ -public class TranslationPixelConverterDecorator implements PixelConverter { - - private final PixelConverter decoratee; - - private final int xPixelOrigin; - - private final int yPixelOrigin; - - /** - * Create a new pixel converter with a custom pixel coordinate origin - * - * @param decoratee the original pixel converter - * @param xPixelOrigin the custom pixel origin x ordinate - * @param yPixelOrigin the custom pixel origin y ordinate - */ - public TranslationPixelConverterDecorator(PixelConverter decoratee, int xPixelOrigin, - int yPixelOrigin) { - super(); - this.decoratee = decoratee; - this.xPixelOrigin = xPixelOrigin; - this.yPixelOrigin = yPixelOrigin; - } - - /** - * @see PixelConverter#pixelToGeo(Point2D, int) - */ - @Override - public GeoPosition pixelToGeo(Point2D pixelCoordinate, int zoom) { - // translate given pixel coordinates - Point2D pixels = new Point((int) pixelCoordinate.getX() + xPixelOrigin, - (int) pixelCoordinate.getY() + yPixelOrigin); - return decoratee.pixelToGeo(pixels, zoom); - } - - /** - * @see PixelConverter#geoToPixel(GeoPosition, int) - */ - @Override - public Point2D geoToPixel(GeoPosition pos, int zoom) throws IllegalGeoPositionException { - Point2D result = decoratee.geoToPixel(pos, zoom); - // translate conversion result - return new Point((int) result.getX() - xPixelOrigin, (int) result.getY() - yPixelOrigin); - } - - /** - * @see PixelConverter#getMapEpsg() - */ - @Override - public int getMapEpsg() { - return decoratee.getMapEpsg(); - } - - /** - * @see PixelConverter#supportsBoundingBoxes() - */ - @Override - public boolean supportsBoundingBoxes() { - return decoratee.supportsBoundingBoxes(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/WaypointRenderer.java b/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/WaypointRenderer.java deleted file mode 100644 index 34bc4fdb37..0000000000 --- a/ext/styledmap/de.fhg.igd.mapviewer/src/de/fhg/igd/mapviewer/waypoints/WaypointRenderer.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.mapviewer.waypoints; - -import java.awt.Graphics2D; -import java.awt.Rectangle; - -import org.jdesktop.swingx.mapviewer.PixelConverter; -import org.jdesktop.swingx.mapviewer.Waypoint; - -import de.fhg.igd.mapviewer.marker.area.Area; - -/** - * WaypointRenderer - * - * @param the way-point type - * @author Simon Templer - * @version $Id: CustomWaypointRenderer.java 582 2009-07-09 07:21:27Z stempler $ - */ -public interface WaypointRenderer { - - /** - * Paints the given way-point - * - * @param g the graphics device - * @param zoom the map zoom level (needed if the rendering is dependent on - * the zoom level) - * @param converter the pixel converter - * @param w the way-point - * @param gBounds the graphics bounds - * @return the bounding shape - */ - public Area paintWaypoint(final Graphics2D g, PixelConverter converter, int zoom, final W w, - Rectangle gBounds); - -} diff --git a/ext/styledmap/de.fhg.igd.swingrcp/.classpath b/ext/styledmap/de.fhg.igd.swingrcp/.classpath deleted file mode 100644 index d8b09e003d..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ext/styledmap/de.fhg.igd.swingrcp/.project b/ext/styledmap/de.fhg.igd.swingrcp/.project deleted file mode 100644 index 1c4f8c1a8c..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - de.fhg.igd.swingrcp - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/ext/styledmap/de.fhg.igd.swingrcp/.settings/edu.umd.cs.findbugs.core.prefs b/ext/styledmap/de.fhg.igd.swingrcp/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 58ce6d564e..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.core.resources.prefs b/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index ff635dadef..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.jdt.core.prefs b/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ab99a2ded1..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,428 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=enabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.jdt.groovy.core.prefs b/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.jdt.launching.prefs b/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 706de46d84..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.jdt.ui.prefs b/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index b90cfe5125..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,68 +0,0 @@ -#Updated from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com;de; -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.pde.core.prefs b/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 5fca39f9f1..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.pde.prefs b/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 0609ce4e70..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:37 PM -#Wed Jul 25 13:58:37 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/ext/styledmap/de.fhg.igd.swingrcp/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.swingrcp/META-INF/MANIFEST.MF deleted file mode 100644 index f2fed328b9..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Swing RCP Bridge -Bundle-SymbolicName: de.fhg.igd.swingrcp;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-Vendor: Fraunhofer IGD -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.ui;bundle-version="3.4.1", - org.eclipse.core.runtime;bundle-version="3.4.0" -Export-Package: de.fhg.igd.swingrcp;version="1.0.0" -Bundle-ActivationPolicy: lazy -Bundle-Activator: de.fhg.igd.swingrcp.SwingRCPPlugin -Import-Package: org.apache.commons.logging;version="1.1.1", - org.jdesktop.swingx.graphics -Automatic-Module-Name: de.fhg.igd.swingrcp diff --git a/ext/styledmap/de.fhg.igd.swingrcp/build.properties b/ext/styledmap/de.fhg.igd.swingrcp/build.properties deleted file mode 100644 index ed683fbd52..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/classes/ -bin.includes = META-INF/,\ - . diff --git a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/ActionAdapter.java b/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/ActionAdapter.java deleted file mode 100644 index c731a5fd1e..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/ActionAdapter.java +++ /dev/null @@ -1,227 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.swingrcp; - -import java.awt.event.ActionEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - -import javax.swing.ImageIcon; -import javax.swing.SwingUtilities; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.widgets.Display; - -/** - * SWT ActionAdapter for Swing Actions - * - * @author Simon Templer - */ -public class ActionAdapter extends Action implements PropertyChangeListener { - - private static final Log log = LogFactory.getLog(ActionAdapter.class); - - private final javax.swing.Action action; - - /** - * The display - */ - protected final Display display; - - /** - * Creates an ActionAdapter - * - * @param action the internal swing action - */ - public ActionAdapter(final javax.swing.Action action) { - this(action, Action.AS_PUSH_BUTTON); - } - - /** - * Creates an ActionAdapter - * - * @param action the internal swing action - * @param style the action style - */ - public ActionAdapter(final javax.swing.Action action, int style) { - super(null, style); - - if (action == null) - throw new IllegalArgumentException(); - - this.action = action; - - this.display = Display.getCurrent(); - if (this.display == null) - throw new IllegalArgumentException("ActionAdapter has to be created in display thread"); - - action.addPropertyChangeListener(this); - - loadImage(); - } - - /** - * Set the actions icon as {@link ImageDescriptor} if possible - */ - @SuppressWarnings("deprecation") - private void loadImage() { - Object icon = action.getValue(javax.swing.Action.SMALL_ICON); - - if (icon instanceof ImageIcon) { - try { - setImageDescriptor(ImageDescriptor - .createFromImageData(SwingRCPUtilities.convertToSWT((ImageIcon) icon))); - } catch (Exception e) { - log.warn("Error converting action icon", e); - } - } - } - - /** - * @see Action#getDescription() - */ - @Override - public String getDescription() { - return (String) action.getValue(javax.swing.Action.LONG_DESCRIPTION); - } - - /** - * @see Action#getText() - */ - @Override - public String getText() { - Object text = action.getValue(javax.swing.Action.NAME); - if (text == null) - return null; - else - return text.toString(); - } - - /** - * @see Action#getToolTipText() - */ - @Override - public String getToolTipText() { - return (String) action.getValue(javax.swing.Action.SHORT_DESCRIPTION); - } - - /** - * @see Action#isEnabled() - */ - @Override - public boolean isEnabled() { - return action.isEnabled(); - } - - /** - * @see Action#setEnabled(boolean) - */ - @Override - public void setEnabled(final boolean enabled) { - final boolean old = isEnabled(); - - action.setEnabled(enabled); - - display.asyncExec(new Runnable() { - - @Override - public void run() { - firePropertyChange("enabled", old, enabled); - } - - }); - } - - /** - * @see Action#setText(java.lang.String) - */ - @Override - public void setText(final String text) { - if (action != null) { - final String old = getText(); - - action.putValue(javax.swing.Action.NAME, text); - - display.asyncExec(new Runnable() { - - @Override - public void run() { - firePropertyChange("text", old, text); - } - - }); - } - } - - /** - * @see Action#setToolTipText(java.lang.String) - */ - @Override - public void setToolTipText(final String toolTipText) { - final String old = getToolTipText(); - - action.putValue(javax.swing.Action.SHORT_DESCRIPTION, toolTipText); - - display.asyncExec(new Runnable() { - - @Override - public void run() { - firePropertyChange(Action.TOOL_TIP_TEXT, old, toolTipText); - } - - }); - } - - /** - * @see Action#run() - */ - @Override - public void run() { - // execute action - SwingUtilities.invokeLater(new Runnable() { - - /** - * @see Runnable#run() - */ - @Override - public void run() { - action.actionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED, null)); - } - - }); - } - - /** - * @see PropertyChangeListener#propertyChange(PropertyChangeEvent) - */ - @Override - public void propertyChange(final PropertyChangeEvent evt) { - // propagate property change event - // -> enabled - if (evt.getPropertyName().equals("enabled")) - display.asyncExec(new Runnable() { - - @Override - public void run() { - firePropertyChange(Action.ENABLED, evt.getOldValue(), evt.getNewValue()); - } - - }); - } - -} diff --git a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/ComponentDialog.java b/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/ComponentDialog.java deleted file mode 100644 index 80aaa3aeb2..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/ComponentDialog.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.swingrcp; - -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Container; -import java.awt.Dimension; - -import org.eclipse.jface.dialogs.TitleAreaDialog; -import org.eclipse.jface.window.Window; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; - -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ - -/** - * A dialog containing a Swing/AWT component - * - * @author Simon Templer - */ -public class ComponentDialog extends TitleAreaDialog { - - private final Component component; - - private final String title; - - private final String message; - - /** - * Constructor - * - * @param parentShell the parent shell - * @param component the main component - * @param title the dialog title - * @param message the dialog message - */ - public ComponentDialog(Shell parentShell, final Component component, final String title, - final String message) { - super(parentShell); - - this.title = title; - this.message = message; - - this.component = component; - - setShellStyle(getShellStyle() | SWT.RESIZE); - } - - /** - * @see TitleAreaDialog#getInitialSize() - */ - @Override - protected Point getInitialSize() { - Point size = getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT); - Point defSize = super.getInitialSize(); - return new Point(Math.max(size.x, defSize.x), Math.max(size.y, defSize.y)); - } - - /** - * @see TitleAreaDialog#createContents(Composite) - */ - @Override - protected Control createContents(Composite parent) { - Control control = super.createContents(parent); - - setMessage(message); - setTitle(title); - - return control; - } - - /** - * @see TitleAreaDialog#createDialogArea(Composite) - */ - @Override - protected Control createDialogArea(Composite parent) { - SwingComposite page = new SwingComposite(parent); - GridData data = new GridData(SWT.FILL, SWT.FILL, true, true); - page.setLayoutData(data); - - Container container = page.getContentPane(); - container.setLayout(new BorderLayout()); - container.add(component); - - Dimension dim = container.getPreferredSize(); - data.widthHint = dim.width; - data.heightHint = dim.height; - - return page; - } - - /** - * @see Window#configureShell(Shell) - */ - @Override - protected void configureShell(Shell newShell) { - super.configureShell(newShell); - - newShell.setText(title); - } - - /** - * @return the component - */ - public Component getComponent() { - return component; - } - -} diff --git a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/ComponentMessageDialog.java b/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/ComponentMessageDialog.java deleted file mode 100644 index 0ebe51593c..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/ComponentMessageDialog.java +++ /dev/null @@ -1,142 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.swingrcp; - -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Container; -import java.awt.Dimension; - -import org.eclipse.jface.dialogs.IDialogConstants; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Shell; - -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ - -/** - * Message dialog that contains an AWT/Swing component - * - * @author Simon Templer - */ -@SuppressWarnings("all") -public class ComponentMessageDialog extends MessageDialog { - - private final Component component; - - /** - * {@inheritDoc} - * - * @param component the component - */ - public ComponentMessageDialog(Shell parentShell, String dialogTitle, Image dialogTitleImage, - String dialogMessage, int dialogImageType, String[] dialogButtonLabels, - int defaultIndex, Component component) { - super(parentShell, dialogTitle, dialogTitleImage, dialogMessage, dialogImageType, - dialogButtonLabels, defaultIndex); - this.component = component; - } - - /** - * @see MessageDialog#createCustomArea(Composite) - */ - @Override - protected Control createCustomArea(Composite parent) { - SwingComposite page = new SwingComposite(parent); - GridData data = new GridData(SWT.FILL, SWT.FILL, true, true); - page.setLayoutData(data); - - Container container = page.getContentPane(); - container.setLayout(new BorderLayout()); - container.add(component); - - Dimension dim = container.getPreferredSize(); - data.widthHint = dim.width; - data.heightHint = dim.height; - - return page; - } - - /** - * @see MessageDialog#openQuestion(Shell, String, String) - * - * @param component the component - */ - public static boolean openQuestion(Shell parent, String title, String message, - Component component) { - return open(QUESTION, parent, title, message, SWT.NONE, component); - } - - /** - * @see MessageDialog#open(int, Shell, String, String, int) - * - * @param component the component - */ - private static boolean open(int kind, Shell parent, String title, String message, int style, - Component component) { - ComponentMessageDialog dialog = new ComponentMessageDialog(parent, title, null, message, - kind, getButtonLabels(kind), 0, component); - style &= SWT.SHEET; - dialog.setShellStyle(dialog.getShellStyle() | style); - return dialog.open() == 0; - } - - /** - * @see MessageDialog#getButtonLabels(int) - */ - static String[] getButtonLabels(int kind) { - String[] dialogButtonLabels; - switch (kind) { - case ERROR: - case INFORMATION: - case WARNING: { - dialogButtonLabels = new String[] { IDialogConstants.OK_LABEL }; - break; - } - case CONFIRM: { - dialogButtonLabels = new String[] { IDialogConstants.OK_LABEL, - IDialogConstants.CANCEL_LABEL }; - break; - } - case QUESTION: { - dialogButtonLabels = new String[] { IDialogConstants.YES_LABEL, - IDialogConstants.NO_LABEL }; - break; - } - case QUESTION_WITH_CANCEL: { - dialogButtonLabels = new String[] { IDialogConstants.YES_LABEL, - IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL }; - break; - } - default: { - throw new IllegalArgumentException("Illegal value for kind in MessageDialog.open()"); //$NON-NLS-1$ - } - } - return dialogButtonLabels; - } - -} diff --git a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/HTMLToolTipProvider.java b/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/HTMLToolTipProvider.java deleted file mode 100644 index ecc358048a..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/HTMLToolTipProvider.java +++ /dev/null @@ -1,420 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.swingrcp; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.Timer; -import java.util.TimerTask; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.jface.action.ContributionItem; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.util.IPropertyChangeListener; -import org.eclipse.jface.util.PropertyChangeEvent; -import org.eclipse.swt.SWT; -import org.eclipse.swt.SWTError; -import org.eclipse.swt.browser.Browser; -import org.eclipse.swt.events.MouseEvent; -import org.eclipse.swt.events.MouseMoveListener; -import org.eclipse.swt.events.MouseTrackAdapter; -import org.eclipse.swt.events.MouseTrackListener; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.ToolBar; -import org.eclipse.swt.widgets.ToolItem; - -/** - * HTMLTooltipProvider - * - * @author Simon Templer - */ -public class HTMLToolTipProvider { - - /** - * ToolTipManager - * - * @author Simon Templer - */ - public class ToolTipManager implements MouseMoveListener, MouseTrackListener { - - private static final int HOVER_DELAY = 400; - - private final ToolBar toolBar; - - private Timer hoverTimer = null; - - private Shell toolShell; - - private ToolItem currentToolItem = null; - - /** - * Creates a tool tip manager for a tool bar - * - * @param toolBar the tool bar - */ - public ToolTipManager(final ToolBar toolBar) { - this.toolBar = toolBar; - - toolBar.addMouseMoveListener(this); - toolBar.addMouseTrackListener(this); - } - - /** - * @see MouseMoveListener#mouseMove(MouseEvent) - */ - @Override - public void mouseMove(final MouseEvent e) { - final ToolItem item = toolBar.getItem(new Point(e.x, e.y)); - - // cancel old task - if (hoverTimer != null) { - hoverTimer.cancel(); - hoverTimer.purge(); - } - - if (currentToolItem != item) { - hideToolTip(); - } - - if (currentToolItem == null && item != null && tooltips.containsKey(item)) { - // start new one - hoverTimer = new Timer(true); - hoverTimer.schedule(new TimerTask() { - - /** - * @see TimerTask#run() - */ - @Override - public void run() { - if (!toolBar.isDisposed()) { - toolBar.getDisplay().asyncExec(new Runnable() { - - @Override - public void run() { - // test if mouse was moved - Point evt = new Point(e.x, e.y); - Point pos = toolBar.getDisplay().getCursorLocation(); - Point pt = toolBar.toControl(pos); - // Rectangle bounds = toolBar.getBounds(); - if (evt.equals(pt)) { - showToolTip(e, tooltips.get(item), item); - } - } - - }); - } - } - - }, HOVER_DELAY); - } - } - - /** - * @see MouseTrackListener#mouseEnter(MouseEvent) - */ - @Override - public void mouseEnter(MouseEvent e) { - mouseMove(e); - } - - /** - * @see MouseTrackListener#mouseExit(MouseEvent) - */ - @Override - public void mouseExit(MouseEvent e) { - if (hoverTimer != null) { - hoverTimer.cancel(); - hoverTimer.purge(); - // XXX on Windows this occurs when showing the tooltip - - // hideToolTip(); - } - } - - /** - * @see MouseTrackListener#mouseHover(MouseEvent) - */ - @Override - public void mouseHover(MouseEvent e) { - // seems to occur never - // log.warn("Mouse hover occurred!"); - } - - /** - * Show the tool tip - * - * @param e the mouse event - * @param toolTip the tool tip string - * @param item the tool item - */ - protected void showToolTip(MouseEvent e, String toolTip, final ToolItem item) { - // set as current item - currentToolItem = item; - - toolShell = new Shell(toolBar.getShell(), SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL); - FillLayout layout = new FillLayout(); - toolShell.setLayout(layout); - try { - Browser browser = new Browser(toolShell, SWT.NONE); - browser.setFont(toolBar.getDisplay().getSystemFont()); - browser.setForeground( - toolBar.getDisplay().getSystemColor(SWT.COLOR_INFO_FOREGROUND)); - browser.setBackground( - toolBar.getDisplay().getSystemColor(SWT.COLOR_INFO_BACKGROUND)); - browser.setText(toolTip); - // Point size = toolShell.computeSize( SWT.DEFAULT, - // SWT.DEFAULT); - int tbh = toolBar.getBounds().height - 1; // use toolbar height - // to show tooltip - // below the bar - int tix = item.getBounds().x + 1; - Point pt = toolBar.toDisplay(tix, tbh); // e.x, e.y); - final int topBuffer = tbh - e.y + 1; - - Rectangle bounds = toolBar.getDisplay().getBounds(); - - int x = (pt.x + toolTipWidth > bounds.x + bounds.width) - ? (bounds.x + bounds.width - toolTipWidth) : (pt.x); - - toolShell.setBounds(x, pt.y, toolTipWidth, toolTipHeight); - // toolShell.setBounds(pt.x, pt.y, size.x, size.y); - - toolShell.addMouseTrackListener(new MouseTrackAdapter() { - - @Override - public void mouseExit(MouseEvent e) { - hideToolTip(); - } - - }); - - final Timer closeTimer = new Timer(true); - closeTimer.scheduleAtFixedRate(new TimerTask() { - - @Override - public void run() { - if (toolShell != null && !toolShell.isDisposed()) { - toolShell.getDisplay().asyncExec(new Runnable() { - - @Override - public void run() { - if (item == currentToolItem && toolShell != null - && !toolShell.isDisposed()) { - // check if cursor is over tooltip - Point cursor = toolShell.getDisplay().getCursorLocation(); - Rectangle bounds = toolShell.getBounds(); - // create top buffer - bounds = new Rectangle(bounds.x, bounds.y - topBuffer, - bounds.width, bounds.height); - if (!bounds.contains(cursor)) { - hideToolTip(); - closeTimer.cancel(); - } - } - } - - }); - } - else { - // disposed -> cancel timer - closeTimer.cancel(); - } - } - - }, 2 * HOVER_DELAY, 1000); - - toolShell.setVisible(true); - } catch (SWTError err) { - log.error(err.getMessage(), err); - } - } - - /** - * Hide the tool tip - */ - protected void hideToolTip() { - currentToolItem = null; - - if (toolShell != null) { - toolShell.close(); - toolShell.dispose(); - toolShell = null; - } - } - - } - - /** - * Custom action item - */ - public class CustomActionItem extends ContributionItem { - - private final IAction action; - - private CustomActionItem(final IAction action) { - this.action = action; - } - - /** - * @see ContributionItem#fill(ToolBar, int) - */ - @Override - public void fill(ToolBar parent, int index) { - // register toolbar - addToolBar(parent); - - // determine ToolItem style - int style; - switch (action.getStyle()) { - case IAction.AS_RADIO_BUTTON: - style = SWT.RADIO; - break; - case IAction.AS_CHECK_BOX: - style = SWT.CHECK; - break; - case IAction.AS_DROP_DOWN_MENU: - style = SWT.DROP_DOWN; - break; - case IAction.AS_PUSH_BUTTON: - default: - style = SWT.PUSH; - } - - // create ToolItem - final ToolItem item = new ToolItem(parent, style, index); - - // determine ToolItem properties - Image image = null; - if (action.getImageDescriptor() != null) - image = action.getImageDescriptor().createImage(); - if (image != null) - item.setImage(image); - else - item.setText(action.getText()); - - item.setSelection(action.isChecked()); - item.setEnabled(action.isEnabled()); - - item.addSelectionListener(new SelectionListener() { - - @Override - public void widgetDefaultSelected(SelectionEvent e) { - action.run(); - } - - @Override - public void widgetSelected(SelectionEvent e) { - action.run(); - } - - }); - - // add property change listeners - action.addPropertyChangeListener(new IPropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent pce) { - // text - if (pce.getProperty().equals(IAction.TEXT)) - item.setText((String) pce.getNewValue()); - // enabled - else if (pce.getProperty().equals(IAction.ENABLED)) - item.setEnabled((Boolean) pce.getNewValue()); - // image - else if (pce.getProperty().equals(IAction.IMAGE)) { - if (pce.getNewValue() != null) { - Image image = ((ImageDescriptor) pce.getNewValue()).createImage(); - item.setImage(image); - } - else - item.setImage(null); - } - } - - }); - - // add to factories map - tooltips.put(item, action.getToolTipText()); - } - - } - - private static final Log log = LogFactory.getLog(HTMLToolTipProvider.class); - - private final Map tooltips = new HashMap(); - - private final Set toolBars = new HashSet(); - - private int toolTipWidth = 240; - - private int toolTipHeight = 100; - - /** - * Create a custom action item for the given action - * - * @param action the action - * - * @return the custom action item - */ - public CustomActionItem createItem(final IAction action) { - return new CustomActionItem(action); - } - - private void addToolBar(ToolBar bar) { - if (!toolBars.contains(bar)) { - toolBars.add(bar); - - new ToolTipManager(bar); - } - } - - /** - * @return the toolTipWidth - */ - public int getToolTipWidth() { - return toolTipWidth; - } - - /** - * @param toolTipWidth the toolTipWidth to set - */ - public void setToolTipWidth(int toolTipWidth) { - this.toolTipWidth = toolTipWidth; - } - - /** - * @return the toolTipHeight - */ - public int getToolTipHeight() { - return toolTipHeight; - } - - /** - * @param toolTipHeight the toolTipHeight to set - */ - public void setToolTipHeight(int toolTipHeight) { - this.toolTipHeight = toolTipHeight; - } - -} diff --git a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/SwingAction.java b/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/SwingAction.java deleted file mode 100644 index 498ce3cc54..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/SwingAction.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ - -package de.fhg.igd.swingrcp; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.image.BufferedImage; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.ImageIcon; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.graphics.ImageData; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PlatformUI; - -/** - * Wraps a Eclipse JFace action in a Swing action - * - * @author Simon Templer - */ -public class SwingAction extends AbstractAction { - - private static final long serialVersionUID = 2848483445310125320L; - - private final IAction action; - - /** - * Creates a Swing action from a JFace action - * - * @param action the JFace action - */ - public SwingAction(IAction action) { - super(); - this.action = action; - - putValue(Action.NAME, action.getText()); - putValue(Action.SHORT_DESCRIPTION, action.getToolTipText()); - putValue(Action.LONG_DESCRIPTION, action.getDescription()); - - ImageDescriptor imageDesc = action.getImageDescriptor(); - if (imageDesc != null) { - ImageData imageData = imageDesc.getImageData(100); - - if (imageData != null) { - BufferedImage img = SwingRCPUtilities.convertToAWT(imageData, true); - ImageIcon icon = new ImageIcon(img); - putValue(Action.SMALL_ICON, icon); - } - } - } - - /** - * @see ActionListener#actionPerformed(ActionEvent) - */ - @Override - public void actionPerformed(ActionEvent e) { - final Display display = PlatformUI.getWorkbench().getDisplay(); - display.asyncExec(new Runnable() { - - @Override - public void run() { - action.run(); - } - }); - } - -} diff --git a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/SwingComposite.java b/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/SwingComposite.java deleted file mode 100644 index 275e366a11..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/SwingComposite.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.swingrcp; - -import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.Frame; - -import javax.swing.JApplet; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.awt.SWT_AWT; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.widgets.Composite; - -/** - * A Composite that provides a content pane for Swing components - * - * @author Simon Templer - */ -public class SwingComposite extends Composite { - - private final Frame frame; - - private final JApplet embedded; - - /** - * Creates a {@link SwingComposite} - * - * @param parent the parent {@link Composite} - */ - public SwingComposite(Composite parent) { - this(parent, 0); - } - - /** - * Creates a {@link SwingComposite} - * - * @param parent the parent {@link Composite} - * @param additionalStyle additional styling attributes - */ - public SwingComposite(Composite parent, int additionalStyle) { - super(parent, SWT.EMBEDDED | SWT.NO_BACKGROUND | additionalStyle); - - SwingRCPUtilities.setup(); - - final Rectangle parentBounds = parent.getBounds(); - parentBounds.x = parentBounds.y = 0; - setBounds(parentBounds); - - frame = SWT_AWT.new_Frame(this); - final Rectangle bounds = getBounds(); - frame.setBounds(0, 0, bounds.width, bounds.height); - frame.setLayout(new BorderLayout()); - - // need a heavyweight component inside the frame, preferably a JRootPane - // -> use JApplet container - embedded = new JApplet(); - - frame.add(embedded); - } - - /** - * Gets the content pane. Add your Swing components to the content pane - * - * @return the content pane - */ - public Container getContentPane() { - return embedded.getContentPane(); - } - -} diff --git a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/SwingRCPPlugin.java b/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/SwingRCPPlugin.java deleted file mode 100644 index 1fa4b38fe2..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/SwingRCPPlugin.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.swingrcp; - -import java.net.URL; -import java.util.Enumeration; -import java.util.jar.Attributes; -import java.util.jar.Manifest; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ - -/** - * Activator - * - * @author Simon Templer - */ -public class SwingRCPPlugin extends AbstractUIPlugin { - - /** - * Look and feel manifest entry name - */ - public static final String LOOK_AND_FEEL = "LookAndFeel"; - - /** - * The plug-in ID - */ - public static final String PLUGIN_ID = "de.fhg.igd.swingrcp"; - - private static String customLookAndFeel = null; - - // The shared instance - private static SwingRCPPlugin plugin; - - /** - * @see AbstractUIPlugin#start(BundleContext) - */ - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - - Enumeration manifestFiles = context.getBundle().findEntries("META-INF", "MANIFEST.MF", - false); - while (manifestFiles.hasMoreElements()) { - URL manifestFile = manifestFiles.nextElement(); - - Manifest manifest = new Manifest(manifestFile.openStream()); - Attributes attributes = manifest.getMainAttributes(); - String value = attributes.getValue(LOOK_AND_FEEL); - - if (value != null) { - setCustomLookAndFeel(value.trim()); - return; - } - } - } - - /** - * @see AbstractUIPlugin#stop(BundleContext) - */ - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static SwingRCPPlugin getDefault() { - return plugin; - } - - /** - * Get the custom look and feel class name - * - * @return the custom look and feel class name - */ - public static String getCustomLookAndFeel() { - return customLookAndFeel; - } - - /** - * @param customLookAndFeel the customLookAndFeel to set - */ - public static void setCustomLookAndFeel(String customLookAndFeel) { - SwingRCPPlugin.customLookAndFeel = customLookAndFeel; - } - -} diff --git a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/SwingRCPUtilities.java b/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/SwingRCPUtilities.java deleted file mode 100644 index 63fc3cfcf3..0000000000 --- a/ext/styledmap/de.fhg.igd.swingrcp/src/de/fhg/igd/swingrcp/SwingRCPUtilities.java +++ /dev/null @@ -1,315 +0,0 @@ -/* - * Copyright (c) 2016 Fraunhofer IGD - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Fraunhofer IGD - */ -package de.fhg.igd.swingrcp; - -import java.awt.Color; -import java.awt.Graphics; -import java.awt.image.BufferedImage; -import java.awt.image.ColorModel; -import java.awt.image.DirectColorModel; -import java.awt.image.IndexColorModel; -import java.awt.image.WritableRaster; - -import javax.swing.ImageIcon; -import javax.swing.UIManager; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.core.runtime.Platform; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.ImageData; -import org.eclipse.swt.graphics.PaletteData; -import org.eclipse.swt.graphics.RGB; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Shell; -import org.jdesktop.swingx.graphics.GraphicsUtilities; - -/** - * SwingRCPUtilities - * - * @author Simon Templer - */ -public class SwingRCPUtilities { - - private static final Log log = LogFactory.getLog(SwingRCPUtilities.class); - - private static boolean lafInitialized = false; - - private static boolean initialized = false; - - /** - * Swing setup, should be called before any AWT/Swing Component is created - */ - public static void setup() { - if (!initialized) { - // set UIManager class loader to allow it to find custom LaFs - UIManager.put("ClassLoader", SwingRCPUtilities.class.getClassLoader()); - - // reduce flicker on Windows - System.setProperty("sun.awt.noerasebackground", "true"); - - // setup look and feel - setupLookAndFeel(); - - initialized = true; - } - } - - /** - * Setup Look and Feel to match SWT looks - */ - public static void setupLookAndFeel() { - if (!lafInitialized) { - String laf; - if (Platform.WS_GTK.equals(Platform.getWS())) { - /* - * Work-around for Eclipse Bug 341799 - * https://bugs.eclipse.org/bugs/show_bug.cgi?id=341799 - * - * A LookAndFeel other than the GTK look and feel has to be used - * when using GTK as window managing system in SWT, as access to - * GTK of ATW/Swing and SWT is not synchronized. - */ - laf = "javax.swing.plaf.metal.MetalLookAndFeel"; - } - else { - laf = SwingRCPPlugin.getCustomLookAndFeel(); - - if (laf == null) { - laf = UIManager.getSystemLookAndFeelClassName(); - } - } - - try { - UIManager.setLookAndFeel(laf); - log.info("Set look and feel to " + laf); - } catch (Exception e) { - log.error("Error setting look and feel: " + laf, e); - } - - lafInitialized = true; - } - } - - /** - * Convert a SWT Image to a {@link BufferedImage} - * - * {@link "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet156.java?view=co"} - * - * @param data the SWT {@link ImageData} - * @param applyAlphaMask true if the image data's alpha mask should be - * applied to the result image (if there is any). This method - * calls {@link #applyTransparencyMask(BufferedImage, ImageData)} - * for that purpose. - * @return the AWT {@link BufferedImage} - */ - public static BufferedImage convertToAWT(ImageData data, boolean applyAlphaMask) { - ColorModel colorModel = null; - PaletteData palette = data.palette; - - BufferedImage result; - if (palette.isDirect) { - colorModel = new DirectColorModel(data.depth, palette.redMask, palette.greenMask, - palette.blueMask); - BufferedImage bufferedImage = new BufferedImage(colorModel, - colorModel.createCompatibleWritableRaster(data.width, data.height), false, - null); - for (int y = 0; y < data.height; y++) { - for (int x = 0; x < data.width; x++) { - int pixel = data.getPixel(x, y); - RGB rgb = palette.getRGB(pixel); - bufferedImage.setRGB(x, y, rgb.red << 16 | rgb.green << 8 | rgb.blue); - } - } - result = bufferedImage; - } - else { - RGB[] rgbs = palette.getRGBs(); - byte[] red = new byte[rgbs.length]; - byte[] green = new byte[rgbs.length]; - byte[] blue = new byte[rgbs.length]; - for (int i = 0; i < rgbs.length; i++) { - RGB rgb = rgbs[i]; - red[i] = (byte) rgb.red; - green[i] = (byte) rgb.green; - blue[i] = (byte) rgb.blue; - } - if (data.transparentPixel != -1) { - colorModel = new IndexColorModel(data.depth, rgbs.length, red, green, blue, - data.transparentPixel); - } - else { - colorModel = new IndexColorModel(data.depth, rgbs.length, red, green, blue); - } - BufferedImage bufferedImage = new BufferedImage(colorModel, - colorModel.createCompatibleWritableRaster(data.width, data.height), false, - null); - WritableRaster raster = bufferedImage.getRaster(); - int[] pixelArray = new int[1]; - for (int y = 0; y < data.height; y++) { - for (int x = 0; x < data.width; x++) { - int pixel = data.getPixel(x, y); - pixelArray[0] = pixel; - raster.setPixel(x, y, pixelArray); - } - } - result = bufferedImage; - } - - if (data.getTransparencyType() == SWT.TRANSPARENCY_MASK && applyAlphaMask) { - result = applyTransparencyMask(result, data.getTransparencyMask()); - } - return result; - } - - /** - * Applies the given transparency mask to a buffered image. Always creates a - * new buffered image containing an alpha channel. Copies the old image into - * the new one and then sets the alpha pixels according to the given mask. - * - * @param img the old image - * @param mask the alpha mask - * @return the new image with alpha channel applied - * @throws IllegalArgumentException if the image's size does not match the - * mask's size - */ - public static BufferedImage applyTransparencyMask(BufferedImage img, ImageData mask) { - if (mask.width != img.getWidth() || mask.height != img.getHeight()) { - throw new IllegalArgumentException("Image size does not match the mask size"); - } - - // copy image and also convert to RGBA - BufferedImage result = new BufferedImage(img.getWidth(), img.getHeight(), - BufferedImage.TYPE_INT_ARGB); - Graphics g = result.getGraphics(); - g.drawImage(img, 0, 0, null); - - WritableRaster alphaRaster = result.getAlphaRaster(); - int alpha0[] = new int[] { 0 }; - int alpha255[] = new int[] { 255 }; - for (int y = 0; y < img.getHeight(); y++) { - for (int x = 0; x < img.getWidth(); x++) { - alphaRaster.setPixel(x, y, mask.getPixel(x, y) == 0 ? alpha0 : alpha255); - } - } - - return result; - } - - /** - * Convert a {@link BufferedImage} to a SWT Image. - * - * {@link "http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.swt.snippets/src/org/eclipse/swt/snippets/Snippet156.java?view=co"} - * - * @param bufferedImage the AWT {@link BufferedImage} - * @return the SWT {@link ImageData} - */ - public static ImageData convertToSWT(BufferedImage bufferedImage) { - if (bufferedImage.getColorModel() instanceof DirectColorModel) { - DirectColorModel colorModel = (DirectColorModel) bufferedImage.getColorModel(); - PaletteData palette = new PaletteData(colorModel.getRedMask(), - colorModel.getGreenMask(), colorModel.getBlueMask()); - ImageData data = new ImageData(bufferedImage.getWidth(), bufferedImage.getHeight(), - colorModel.getPixelSize(), palette); - for (int y = 0; y < data.height; y++) { - for (int x = 0; x < data.width; x++) { - int rgb = bufferedImage.getRGB(x, y); - int pixel = palette - .getPixel(new RGB((rgb >> 16) & 0xFF, (rgb >> 8) & 0xFF, rgb & 0xFF)); - data.setPixel(x, y, pixel); - // also set the alpha value (ST) - data.setAlpha(x, y, colorModel.getAlpha(rgb)); - } - } - return data; - } - else if (bufferedImage.getColorModel() instanceof IndexColorModel) { - IndexColorModel colorModel = (IndexColorModel) bufferedImage.getColorModel(); - int size = colorModel.getMapSize(); - byte[] reds = new byte[size]; - byte[] greens = new byte[size]; - byte[] blues = new byte[size]; - colorModel.getReds(reds); - colorModel.getGreens(greens); - colorModel.getBlues(blues); - RGB[] rgbs = new RGB[size]; - for (int i = 0; i < rgbs.length; i++) { - rgbs[i] = new RGB(reds[i] & 0xFF, greens[i] & 0xFF, blues[i] & 0xFF); - } - PaletteData palette = new PaletteData(rgbs); - ImageData data = new ImageData(bufferedImage.getWidth(), bufferedImage.getHeight(), - colorModel.getPixelSize(), palette); - data.transparentPixel = colorModel.getTransparentPixel(); - WritableRaster raster = bufferedImage.getRaster(); - int[] pixelArray = new int[1]; - for (int y = 0; y < data.height; y++) { - for (int x = 0; x < data.width; x++) { - raster.getPixel(x, y, pixelArray); - data.setPixel(x, y, pixelArray[0]); - } - } - return data; - } - return null; - } - - /** - * Create a SWT Image from an {@link ImageIcon} - * - * {@link "http://www.eclipseproject.de/modules.php?name=Forums&file=viewtopic&t=5489"} - * {@link "http://www.9php.com/FAQ/cxsjl/java/2007/11/5033330101296.html"} - * - * @param icon the {@link ImageIcon} - * @return the SWT {@link ImageData} - */ - public static ImageData convertToSWT(ImageIcon icon) { - BufferedImage img = GraphicsUtilities.createCompatibleTranslucentImage(icon.getIconWidth(), - icon.getIconHeight()); - - img.getGraphics().drawImage(icon.getImage(), 0, 0, null); - - return convertToSWT(img); - } - - /** - * Convert a {@link RGB} to an AWT color - * - * @param rgb the {@link RGB} - * - * @return the color - */ - public static Color convertToColor(RGB rgb) { - return new Color(rgb.red, rgb.green, rgb.blue); - } - - /** - * Get the workbench display - * - * @return the display - */ - public static Display getDisplay() { - return SwingRCPPlugin.getDefault().getWorkbench().getDisplay(); - } - - /** - * Get the active workbench shell - * - * @return the shell - */ - public static Shell getShell() { - return getDisplay().getActiveShell(); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/.project b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/.project deleted file mode 100644 index 0ef9fac0f8..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - eu.esdihumboldt.hale.doc.user.views.styledmap - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/.settings/org.eclipse.pde.core.prefs b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index e20142e4aa..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Thu Mar 15 14:07:32 CET 2012 -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/META-INF/MANIFEST.MF b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/META-INF/MANIFEST.MF deleted file mode 100644 index 7ccf0d7985..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/META-INF/MANIFEST.MF +++ /dev/null @@ -1,6 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Styled Map View User Documentation -Bundle-SymbolicName: eu.esdihumboldt.hale.doc.user.views.styledmap;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-Vendor: data harmonisation panel diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/build.properties b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/build.properties deleted file mode 100644 index 0859f6b52f..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/build.properties +++ /dev/null @@ -1,9 +0,0 @@ -bin.includes = META-INF/,\ - plugin.xml,\ - images/,\ - html/,\ - toc.views.xml,\ - toc.gettingstarted.xml,\ - toc.tasks_data.xml,\ - contexts.xml,\ - toc.mapconfiguration.xml diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/contexts.xml b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/contexts.xml deleted file mode 100644 index 41bb50bbc3..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/contexts.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - The map displays the geo-referenced default geometries of source and transformed instances. - - - - - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/customtile_detail.html b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/customtile_detail.html deleted file mode 100644 index ff3f56bbfe..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/customtile_detail.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - -Map configuration via Custom Tile URL - - -

Custom Tile Server Configuration

-

- By configuring custom tile map servers, you can use any map based on - the web tiling scheme in hale studio's map view. -

-

- To work with Custom Tile maps, first open the Map view, go to - the Window menu, select Show View and pick Map. -

- -
- -
- -

By default, hale studio uses the Stamen Terrain map in the Map - view. Map tiles by Stamen Design, - under - CC BY 3.0. Data by - OpenStreetMap, under - - CC BY SA.

- -
- -
- - -

- To add the Custom Tile map in to Map view, click on the View - Menu button and then head to Custom Tile Maps→Add. -

- -
- -
- - -

Click on the Add button, then provide a unique name for the - service and enter the URL pattern.

-

- Please note, name should be unique in Custom Tile maps. The URL - Pattern has to include {z}, {x} and {y} literals which will be - replaced by the hale studio as Zoom level, x-coordinate and y-coordinate - respectively while fetching the tiles. To go to the next configuration - page, click on Next button in the dialog or click Finish - directly to skip next configuration pages. -

-
- -
- -

- On this page, You have to provide the maximum zoom level for - the map (default is 16) and attribution text of the map server. Click - Finish to complete the configuration. -

-
- -
- -

- Before using a map you should make sure that you doing so is in - compliance with the respective terms of use. -

- -

- After finishing configuration, your Custom Tile map is loaded - in to Map view. -

-
- -
- -

To change the configuration for a custom tile map, click on the - name you set before. Change any of the settings by stepping through - the dialog again.

- -
- -
-
- - \ No newline at end of file diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/map_perspective.html b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/map_perspective.html deleted file mode 100644 index 48e0d9efc0..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/map_perspective.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - -Map perspective - - -

Map perspective

-

The map perspective features a map view that displays the - geometries contained in the data, provided that the corresponding - coordinates reference systems are known.

-
- -
-

Following is a short description of the perspective's views:

-
    -
  • The Map view provides you with a cartographic - representation of the data. Source and transformed data are displayed - alongside each other, with different layouts to choose from. The map - can be used to select instances for examination in the data views, or - vice versa. -
    • -
  • The Source Data view displays samples of the loaded - source data. A filter query can be used to control which instances - are displayed. -
    • -
  • The Transformed Data view displays samples of the - transformed data. By default it is synchronized to the Source - Data view and contains the transformation result of the instances - represented there. -
    • -
- - \ No newline at end of file diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/map_view.html b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/map_view.html deleted file mode 100644 index 24a7cdefd6..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/map_view.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - -Map view - - -

Map view

-

- The Map view provides you with a cartographic representation of - the data. Source and transformed data can be displayed alongside each - other, with different layouts to choose from. -

-

- For an instance to be displayed in the map, it has to include geometry - objects, together with a definition of the associated coordinate - reference system. For source data, this depends on the support - provided for geometries for the respective import format. The map will - display the geometries contained in the default geometry - property. hale studio will try to determine the property - automatically based on the schema, but you can also assign it manually - for each schema type using the context menu in the Schema - Explorer. The schema element that is the current default geometry - property of a type is marked with a small green triangle in its icon - (see the Schema - elements reference). -

-
- -
-

- The source and transformed data can be displayed together in the map, - you can choose from several layouts to split the map between the two, - display both data sets at once or only one of them. These layouts are - available in the application tool bar or in the Map→Layout - menu. -

-
- -
-

- Selecting instances is possible by clicking on them. In the above - image the selected instances are highlighted in red. To select - multiple instances, use CTRL + click. You can inspect - selected instances in the data views - the Source - Data view for source instances or the Transformed - Data view for transformed instances - provided you activate the - option Use instances selected in the application in the upper - left corner of the data view. -

-

Please note that if the geometries representing an - instance would be very small in the map, so that they could not easily - be selected, instead a small circle is painted to indicate the - geometry's position.

-

- It is also possible to synchronize map and data views the other way - round. The image below shows how a sample selection made in the source - data view through a filter is displayed in the map view, the selection - again highlighted in red. To use the data view like this, you have to - activate the button Enable providing an instance selection for - the application in the data view's tool bar. -

-
- -
- -
- - - - - - - \ No newline at end of file diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/styling_data.html b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/styling_data.html deleted file mode 100644 index 249b59021e..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/styling_data.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - -Styling of your Data - - -

Styling of your Data

-

- For the map view it is possible to use a - custom styling. The easiest way to do this, is to change the settings - for the default styles. To do so, open the Settings dialog, - using Window→Settings, then choose the Default - styles preference page and adapt it to your liking. -

-

- But there are also more advanced options to customize the styling. - Specifically, you can configure so-called Styled Layer Descriptors for - each schema type, using a rich GUI. In the Schema - Explorer, select the type for which you want to define a styling, - select Change style from the context menu and then configure your styling - rule. You can define styles for points, lines and polygons, and you - can define complex styles with filter rules. -

-
- -
-

- It is also possible to command linkload a styling from a XML Styled layer - Descriptor file. Using this feature to load a predefined styling for - the transformed data allows to get a live impression in the map of the - progress of your mapping endeavor. -

-
- -
- - \ No newline at end of file diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/wms_detail.html b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/wms_detail.html deleted file mode 100644 index bd7b971d01..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/html/wms_detail.html +++ /dev/null @@ -1,110 +0,0 @@ - - - - -Map configuration via Web Map Service (WMS) - - -

WMS Configuration

-

- A Web Map Service (WMS) is a standard protocol for serving georeferenced - map images which a map server generates using data from a GIS database. - You can set up hale studio's Map view to use such a WMS. -

-

- To work with WMS map, first open the Map view, go to - the Window menu, select Show View and pick Map. -

- -
- - -
- -

- To add the WMS maps in the Map view, click on the View Menu - and then pick WMS maps→Add. -

- -
- -
- - -

- Click on the Add button, then provide a unique name for the service and - enter the Web service URL. -

-

- Please note here name must be unique from any other WMS map configurations - and URL should be valid to fetch capabilities. To go to the next configuration - page, click on Next button in the dialog or click Finish directly - to skip next configuration pages. -

-
- -
-

- On the next page, select the Spatial reference system supported by the - WMS from the drop down list. To go to the next configuration page, - click on Next button in the dialog or click Finish to skip - next configuration pages and complete configuration. -

-
- -
- -

- On this page, select Layers supported by the WMS that you - want to display in the Map view. To go to the next configuration page, - click on Next button in the dialog or click Finish to skip - next configuration pages and complete configuration. -

-
- -
- -

- On this page, configure map Tiles. You have to provide the number - of zoom level for the map, minimum tile size(px) as width or - height and minimum map size(px) as width or height. Please note, - you have to define values between 1 to 100 for zoom levels, - between 64 to 1024 for tile size and between 64 to 65,536 for - map size otherwise you can not proceed to finish. - - Click Finish to complete the configuration. -

-
- -
- - -

- After finishing configuration, hale studio displays the WMS map - in the Map view. -

-
- -
- -

- To change the configuration for a WMS map, click on the name - you set before. Change any of the settings by stepping through the - dialog again. -

- -
- -
-
- - \ No newline at end of file diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_add.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_add.png deleted file mode 100644 index 8be04ffe23..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_add.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_basic.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_basic.png deleted file mode 100644 index d905bcce94..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_basic.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_configure.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_configure.png deleted file mode 100644 index 9d083f5280..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_configure.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_default.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_default.png deleted file mode 100644 index c70a483d5e..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_default.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_default_menu.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_default_menu.png deleted file mode 100644 index 9496cdcc92..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_default_menu.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_extension.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_extension.png deleted file mode 100644 index 6b2f91b6ca..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_extension.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_view.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_view.png deleted file mode 100644 index 4f770c2465..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/custom_view.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/data_synch.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/data_synch.png deleted file mode 100644 index 803e2f6cb3..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/data_synch.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/def_geom.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/def_geom.png deleted file mode 100644 index 8e9a7ba8c8..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/def_geom.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/edit_style.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/edit_style.png deleted file mode 100644 index 5f93c843af..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/edit_style.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/map_perspective.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/map_perspective.png deleted file mode 100644 index 56c282dfd6..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/map_perspective.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/map_perspective_open.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/map_perspective_open.png deleted file mode 100644 index c3615e08de..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/map_perspective_open.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/map_perspective_toolbar.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/map_perspective_toolbar.png deleted file mode 100644 index e2a72267d9..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/map_perspective_toolbar.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/map_rules.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/map_rules.png deleted file mode 100644 index 8060c19e3e..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/map_rules.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/split_data.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/split_data.png deleted file mode 100644 index 3431f014fa..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/split_data.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_add.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_add.png deleted file mode 100644 index 5f10370517..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_add.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_basic.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_basic.png deleted file mode 100644 index 4cb59bb5be..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_basic.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_configure.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_configure.png deleted file mode 100644 index f89ac2731b..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_configure.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_layers.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_layers.png deleted file mode 100644 index 98684103da..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_layers.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_srs.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_srs.png deleted file mode 100644 index e1f5264b1a..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_srs.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_tiles.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_tiles.png deleted file mode 100644 index a919e6a72c..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_tiles.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_view.png b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_view.png deleted file mode 100644 index a2b8b982e6..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/images/wms_view.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/plugin.xml b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/plugin.xml deleted file mode 100644 index b6eab6ec99..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/plugin.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/toc.gettingstarted.xml b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/toc.gettingstarted.xml deleted file mode 100644 index 1ccf71b717..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/toc.gettingstarted.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/toc.mapconfiguration.xml b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/toc.mapconfiguration.xml deleted file mode 100644 index a66872c93d..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/toc.mapconfiguration.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/toc.tasks_data.xml b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/toc.tasks_data.xml deleted file mode 100644 index 745103df24..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/toc.tasks_data.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/toc.views.xml b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/toc.views.xml deleted file mode 100644 index f7d0d007f4..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/toc.views.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/.project b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/.project deleted file mode 100644 index 54a69d4776..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - eu.esdihumboldt.hale.ui.views.styledmap.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/build.properties b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/build.properties deleted file mode 100644 index 64f93a9f0b..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/feature.xml b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/feature.xml deleted file mode 100644 index dcaef4fd4a..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/feature.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - GNU Lesser General Public License, license of included dependencies may vary (see the individual plug-ins). - - - - - - - - - - - - - - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.classpath b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.project b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.project deleted file mode 100644 index 577d7dda49..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - eu.esdihumboldt.hale.ui.views.styledmap - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/edu.umd.cs.findbugs.core.prefs b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index e49a3b97d4..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Updated from default preferences Apr 11, 2014 12:49:57 PM -#Fri Apr 11 12:49:57 CEST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.core.resources.prefs b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index c03f1c05ac..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 06.01.2012 15:20:33 -#Fri Jan 06 15:20:33 CET 2012 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.jdt.core.prefs b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f27049f484..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.jdt.groovy.core.prefs b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.jdt.launching.prefs b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 1010918ecd..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 06.01.2012 15:20:33 -#Fri Jan 06 15:20:33 CET 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.jdt.ui.prefs b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 2f62d8400a..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Updated from default preferences Jul 9, 2016 10:07:17 AM -#Sat Jul 09 10:07:17 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.pde.core.prefs b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 3487e7635c..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Nov 7, 2012 11:02:23 AM -#Wed Nov 07 11:02:23 CET 2012 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.pde.prefs b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/META-INF/MANIFEST.MF b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/META-INF/MANIFEST.MF deleted file mode 100644 index e8e5553e20..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/META-INF/MANIFEST.MF +++ /dev/null @@ -1,96 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Styled Map View -Bundle-SymbolicName: eu.esdihumboldt.hale.ui.views.styledmap;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-Activator: eu.esdihumboldt.hale.ui.views.styledmap.internal.StyledMapBundle -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.opengis, - org.eclipse.help;bundle-version="3.5.100" -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: de.fhg.igd.eclipse.ui.util.extension, - de.fhg.igd.eclipse.ui.util.extension.exclusive, - de.fhg.igd.eclipse.util.extension, - de.fhg.igd.eclipse.util.extension.exclusive, - de.fhg.igd.eclipse.util.extension.selective, - de.fhg.igd.geom, - de.fhg.igd.geom.shape, - de.fhg.igd.mapviewer;version="1.0.0", - de.fhg.igd.mapviewer.marker;version="1.0.0", - de.fhg.igd.mapviewer.marker.area, - de.fhg.igd.mapviewer.tip, - de.fhg.igd.mapviewer.tools;version="1.0.0", - de.fhg.igd.mapviewer.tools.renderer;version="1.0.0", - de.fhg.igd.mapviewer.view;version="1.0.0", - de.fhg.igd.mapviewer.view.overlay;version="1.0.0", - de.fhg.igd.mapviewer.waypoints;version="1.0.0", - de.fhg.igd.slf4jplus, - eu.esdihumboldt.hale.common.align.transformation.service, - eu.esdihumboldt.hale.common.convert, - eu.esdihumboldt.hale.common.core.io.supplier, - eu.esdihumboldt.hale.common.instance.helper, - eu.esdihumboldt.hale.common.instance.model, - eu.esdihumboldt.hale.common.instance.model.impl, - eu.esdihumboldt.hale.common.schema, - eu.esdihumboldt.hale.common.schema.geometry, - eu.esdihumboldt.hale.common.schema.model, - eu.esdihumboldt.hale.ui, - eu.esdihumboldt.hale.ui.common.help, - eu.esdihumboldt.hale.ui.common.service.style, - eu.esdihumboldt.hale.ui.geometry, - eu.esdihumboldt.hale.ui.geometry.service, - eu.esdihumboldt.hale.ui.selection, - eu.esdihumboldt.hale.ui.selection.impl, - eu.esdihumboldt.hale.ui.service.instance, - eu.esdihumboldt.hale.ui.service.schema, - eu.esdihumboldt.hale.ui.style, - eu.esdihumboldt.hale.ui.style.service.internal, - eu.esdihumboldt.hale.ui.util, - eu.esdihumboldt.hale.ui.util.io, - eu.esdihumboldt.hale.ui.views.data, - gnu.trove, - org.apache.commons.logging, - org.geotools.geometry;version="29.1.0.combined", - org.geotools.geometry.jts;version="29.1.0.combined", - org.geotools.referencing;version="29.1.0.combined", - org.geotools.renderer.lite;version="29.1.0.combined", - org.geotools.renderer.style;version="29.1.0.combined", - org.geotools.styling;version="29.1.0.combined", - org.geotools.util;version="29.1.0.combined", - org.jdesktop.beans, - org.jdesktop.swingx.image, - org.jdesktop.swingx.mapviewer;version="1.0.0", - org.jdesktop.swingx.painter, - org.locationtech.jts.geom, - org.opengis.feature;version="29.1.0", - org.opengis.feature.simple;version="29.1.0", - org.opengis.feature.type;version="29.1.0", - org.opengis.filter;version="29.1.0", - org.opengis.filter.identity;version="29.1.0", - org.opengis.geometry;version="29.1.0", - org.opengis.metadata;version="29.1.0", - org.opengis.referencing;version="29.1.0", - org.opengis.referencing.crs;version="29.1.0", - org.opengis.referencing.cs;version="29.1.0", - org.opengis.referencing.operation;version="29.1.0", - org.opengis.style;version="29.1.0", - org.opengis.util;version="29.1.0", - org.slf4j;version="1.5.11", - org.springframework.core.convert;version="5.2.0" -Export-Package: eu.esdihumboldt.hale.ui.views.styledmap, - eu.esdihumboldt.hale.ui.views.styledmap.clip, - eu.esdihumboldt.hale.ui.views.styledmap.clip.impl, - eu.esdihumboldt.hale.ui.views.styledmap.clip.layout, - eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension, - eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.internal;x-internal:=true, - eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.impl, - eu.esdihumboldt.hale.ui.views.styledmap.handler, - eu.esdihumboldt.hale.ui.views.styledmap.internal;x-internal:=true, - eu.esdihumboldt.hale.ui.views.styledmap.painter, - eu.esdihumboldt.hale.ui.views.styledmap.preferences, - eu.esdihumboldt.hale.ui.views.styledmap.tool, - eu.esdihumboldt.hale.ui.views.styledmap.util -Bundle-Vendor: data harmonisation panel, Fraunhofer IGD -Automatic-Module-Name: eu.esdihumboldt.hale.ui.views.styledmap diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/about.ini b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/about.ini deleted file mode 100644 index e1a8614ccd..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/about.ini +++ /dev/null @@ -1,8 +0,0 @@ -featureImage=icons/cs3d.png -aboutText=Styled Map Viewer for HALE\n\ -Copyright 2012-2014 data harmonisation panel, Fraunhofer IGD\n\ -\n\ -http://www.igd.fraunhofer.de/geo\n\ -http://www.dhpanel.eu\n\ -\n\ -Contains software developed by Fraunhofer Institute for Computer Graphics Research IGD. \ No newline at end of file diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/build.properties b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/build.properties deleted file mode 100644 index 7e12bdaa52..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - schema/,\ - about.ini,\ - icons/ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/bl_to_tr.png b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/bl_to_tr.png deleted file mode 100644 index aea3664823..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/bl_to_tr.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/bottom_to_top.gif b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/bottom_to_top.gif deleted file mode 100644 index 16d04c48e0..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/bottom_to_top.gif and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/br_to_tl.png b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/br_to_tl.png deleted file mode 100644 index 57c5cb572e..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/br_to_tl.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/cs3d.png b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/cs3d.png deleted file mode 100644 index 84afb0e569..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/cs3d.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/igd.png b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/igd.png deleted file mode 100644 index dab6ef7913..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/igd.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/left-to-right.gif b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/left-to-right.gif deleted file mode 100644 index 4633d0118d..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/left-to-right.gif and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/nav_bounds.png b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/nav_bounds.png deleted file mode 100644 index 5bb1a6e68d..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/nav_bounds.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/navigation.png b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/navigation.png deleted file mode 100644 index 6013edb65e..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/navigation.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/overlay.pdn b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/overlay.pdn deleted file mode 100644 index e63d2fbae3..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/overlay.pdn and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/overlay.png b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/overlay.png deleted file mode 100644 index 9d4302d8ed..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/overlay.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/pointer.png b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/pointer.png deleted file mode 100644 index 83d433336a..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/pointer.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/right-to-left.gif b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/right-to-left.gif deleted file mode 100644 index 60cbb626e2..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/right-to-left.gif and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/source.png b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/source.png deleted file mode 100644 index 1bd4567df5..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/source.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/target.png b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/target.png deleted file mode 100644 index d2ea29cf32..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/target.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/tl_to_br.png b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/tl_to_br.png deleted file mode 100644 index 8cbf67f50b..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/tl_to_br.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/top_to_bottom.gif b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/top_to_bottom.gif deleted file mode 100644 index 2301071e71..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/top_to_bottom.gif and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/tr_to_bl.png b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/tr_to_bl.png deleted file mode 100644 index 21882f770f..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/tr_to_bl.png and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/world.gif b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/world.gif deleted file mode 100644 index ec6cca4525..0000000000 Binary files a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/icons/world.gif and /dev/null differ diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/plugin.xml b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/plugin.xml deleted file mode 100644 index 5f7385c26d..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/plugin.xml +++ /dev/null @@ -1,398 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/schema/eu.esdihumboldt.hale.ui.views.styledmap.layout.exsd b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/schema/eu.esdihumboldt.hale.ui.views.styledmap.layout.exsd deleted file mode 100644 index 5ec93941dd..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/schema/eu.esdihumboldt.hale.ui.views.styledmap.layout.exsd +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - [Enter description of this extension point.] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Integer value for ordering - - - - - - - - - - - - - - - - - - - - - - - - - - - [Enter the first release in which this extension point appears.] - - - - - - - - - [Enter extension point usage example here.] - - - - - - - - - [Enter API information here.] - - - - - - - - - [Enter information about supplied implementation of this extension point.] - - - - - diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/GTKAWTBridgePopupFix.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/GTKAWTBridgePopupFix.java deleted file mode 100644 index 59d956d534..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/GTKAWTBridgePopupFix.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap; - -import java.util.concurrent.atomic.AtomicInteger; - -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.Shell; - -/** - * Helper class providing a work-around for Eclipse Bug 233450 ( - * {@link "https://bugs.eclipse.org/bugs/show_bug.cgi?id=233450"}) where with - * GTK as windowing system it is not possible to show a SWT menu on top of a - * AWT/Swing component.
- *
- * Implementation based on - * {@link "http://www.eclipsezone.com/eclipse/forums/t95687.html"} - * - * @author Simon Templer - */ -public class GTKAWTBridgePopupFix { - - private static final int MAX_ATTEMPTS = 200; - private static final int MAX_RETRIES = 5; - - /** - * Show the given SWT menu. Must be called from the display thread. - * - * @param menu the menu to show - */ - public static void showMenu(final Menu menu) { - showMenu(menu, MAX_RETRIES); - } - - private static void showMenu(final Menu menu, final int retriesLeft) { - if (retriesLeft > 0) { - final Display display = Display.getCurrent(); - - // remember the active shell - final Shell active = display.getActiveShell(); - - // create a dummy shell the popup will be displayed over - final Shell useForPopups = new Shell(display, SWT.NO_TRIM | SWT.NO_FOCUS | SWT.ON_TOP); - Point l = display.getCursorLocation(); - l.x -= 2; - l.y -= 2; - useForPopups.setLocation(l); - useForPopups.setSize(4, 4); - useForPopups.open(); - final AtomicInteger count = new AtomicInteger(0); - - Runnable r = new Runnable() { - - private Listener hideListener; - private Listener showListener; - - private void removeListeners() { - if (hideListener != null) { - menu.removeListener(SWT.Hide, hideListener); - } - if (showListener != null) { - menu.removeListener(SWT.Show, showListener); - } - } - - @Override - public void run() { - useForPopups.setActive(); - - menu.addListener(SWT.Hide, hideListener = new Listener() { - - @Override - public void handleEvent(Event e) { - removeListeners(); - useForPopups.dispose(); - if (!active.isDisposed()) { - active.setActive(); - } - } - }); - menu.addListener(SWT.Show, showListener = new Listener() { - - @Override - public void handleEvent(Event e) { - count.incrementAndGet(); - if (!menu.isVisible() && count.get() > MAX_ATTEMPTS) { - Runnable r = new Runnable() { - - @Override - public void run() { - menu.setVisible(false); - removeListeners(); - useForPopups.dispose(); - showMenu(menu, retriesLeft - 1); - } - }; - display.asyncExec(r); - return; - } - - Runnable r = new Runnable() { - - @Override - public void run() { - if (!menu.isVisible()) { - menu.setVisible(true); - } - } - }; - display.asyncExec(r); - } - }); - - menu.setVisible(true); - } - }; - - display.asyncExec(r); - } - } -} \ No newline at end of file diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/InstanceMapTip.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/InstanceMapTip.java deleted file mode 100644 index 54de2b99a0..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/InstanceMapTip.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap; - -import java.awt.Point; -import java.util.List; - -import org.jdesktop.swingx.mapviewer.PixelConverter; - -import de.fhg.igd.mapviewer.BasicMapKit; -import de.fhg.igd.mapviewer.tip.HoverMapTip; -import eu.esdihumboldt.hale.ui.views.styledmap.painter.AbstractInstancePainter; -import eu.esdihumboldt.hale.ui.views.styledmap.painter.InstanceWaypoint; -import eu.esdihumboldt.hale.ui.views.styledmap.painter.SourceInstancePainter; -import eu.esdihumboldt.hale.ui.views.styledmap.painter.TransformedInstancePainter; - -/** - * Map tooltip for instances. Based on {@link AbstractInstancePainter}s. - * - * @author Simon Templer - */ -public class InstanceMapTip extends HoverMapTip { - - private final BasicMapKit mapKit; - - /** - * Create instance tool tips. - * - * @param mapKit the map kit - */ - public InstanceMapTip(BasicMapKit mapKit) { - this.mapKit = mapKit; - } - - /** - * @see de.fhg.igd.mapviewer.tip.HoverMapTip#getTipText(int, int, - * org.jdesktop.swingx.mapviewer.PixelConverter, int) - */ - @Override - protected String getTipText(int x, int y, PixelConverter converter, int zoom) { - Point point = new Point(x, y); - - String sourceName = null; - List sourcePainters = mapKit - .getTilePainters(SourceInstancePainter.class); - if (!sourcePainters.isEmpty()) { - InstanceWaypoint wp = sourcePainters.get(0).findWaypoint(point); - if (wp != null) { - sourceName = wp.getName(); - } - } - - String transformedName = null; - List transformedPainters = mapKit - .getTilePainters(TransformedInstancePainter.class); - if (!transformedPainters.isEmpty()) { - InstanceWaypoint wp = transformedPainters.get(0).findWaypoint(point); - if (wp != null) { - transformedName = wp.getName(); - } - } - - if (sourceName != null && sourceName.equals(transformedName)) { - // if both are equal, return one name only - return sourceName; - } - - if (sourceName != null) { - sourceName += " (source)"; - } - if (transformedName != null) { - transformedName += " (transformed)"; - } - - if (sourceName != null && transformedName != null) { - return sourceName + "; " + transformedName; - } - else if (sourceName != null) { - return sourceName; - } - else if (transformedName != null) { - return transformedName; - } - - return null; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/StyledMapExtra.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/StyledMapExtra.java deleted file mode 100644 index dea22ca41a..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/StyledMapExtra.java +++ /dev/null @@ -1,277 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap; - -import org.eclipse.ui.IPartListener2; -import org.eclipse.ui.IPartService; -import org.eclipse.ui.ISelectionService; -import org.eclipse.ui.IWorkbenchPartReference; -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; - -import de.fhg.igd.eclipse.util.extension.selective.SelectiveExtension.SelectiveExtensionListener; -import de.fhg.igd.mapviewer.view.MapView; -import de.fhg.igd.mapviewer.view.MapViewExtension; -import de.fhg.igd.mapviewer.view.overlay.ITileOverlayService; -import de.fhg.igd.mapviewer.view.overlay.TileOverlayFactory; -import eu.esdihumboldt.hale.ui.common.service.style.StyleService; -import eu.esdihumboldt.hale.ui.geometry.service.GeometrySchemaService; -import eu.esdihumboldt.hale.ui.service.instance.InstanceService; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterLayoutController; -import eu.esdihumboldt.hale.ui.views.styledmap.painter.AbstractInstancePainter; - -/** - * Map view extension for the styled instance map. - * - * @author Simon Templer - */ -public class StyledMapExtra implements MapViewExtension, IPartListener2 { - - private MapView mapView; - - private PainterLayoutController layoutController; - - /** - * @see MapViewExtension#setMapView(MapView) - */ - @Override - public void setMapView(MapView mapView) { - this.mapView = mapView; - - layoutController = new PainterLayoutController(mapView.getMapKit()); - - /* - * Listen for activated/deactivated instance painters - * - * - remove listeners for deactivated painters and clear the waypoints - - * update activated listeners and add the corresponding listeners - */ - ITileOverlayService overlayService = PlatformUI.getWorkbench() - .getService(ITileOverlayService.class); - overlayService.addListener( - new SelectiveExtensionListener() { - - @Override - public void deactivated(TileOverlayPainter object, - TileOverlayFactory definition) { - if (object instanceof AbstractInstancePainter) { - AbstractInstancePainter painter = (AbstractInstancePainter) object; - - // get services - ISelectionService selection = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getSelectionService(); - InstanceService instances = PlatformUI.getWorkbench() - .getService(InstanceService.class); - StyleService styles = PlatformUI.getWorkbench() - .getService(StyleService.class); - GeometrySchemaService geometries = PlatformUI.getWorkbench() - .getService(GeometrySchemaService.class); - - // remove listeners - selection.removeSelectionListener(painter); - instances.removeListener(painter); - styles.removeListener(painter.getStyleListener()); - geometries.removeListener(painter.getGeometryListener()); - - // clear way-points - painter.clearWaypoints(); - } - } - - @Override - public void activated(TileOverlayPainter object, - TileOverlayFactory definition) { - if (object instanceof AbstractInstancePainter) { - AbstractInstancePainter painter = (AbstractInstancePainter) object; - - // get services - ISelectionService selection = PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getSelectionService(); - InstanceService instances = PlatformUI.getWorkbench() - .getService(InstanceService.class); - StyleService styles = PlatformUI.getWorkbench() - .getService(StyleService.class); - GeometrySchemaService geometries = PlatformUI.getWorkbench() - .getService(GeometrySchemaService.class); - - // update - painter.update(selection.getSelection()); - - // add listeners - selection.addSelectionListener(painter); - instances.addListener(painter); - styles.addListener(painter.getStyleListener()); - geometries.addListener(painter.getGeometryListener()); - } - } - }); - - IPartService partService = mapView.getSite().getService(IPartService.class); - partService.addPartListener(this); - - // map tips - mapView.getMapTips().addMapTip(new InstanceMapTip(mapView.getMapKit()), 5); - } - - /** - * @see IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference) - */ - @Override - public void partClosed(IWorkbenchPartReference partRef) { - if (partRef.getPart(false) == mapView) { - layoutController.disable(); - - // get services - ISelectionService selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getSelectionService(); - InstanceService instances = PlatformUI.getWorkbench().getService(InstanceService.class); - StyleService styles = PlatformUI.getWorkbench().getService(StyleService.class); - GeometrySchemaService geometries = PlatformUI.getWorkbench() - .getService(GeometrySchemaService.class); - - // remove listeners - disableScenePainterListeners(selection, instances, styles, geometries); - } - } - - /** - * @see IPartListener2#partOpened(org.eclipse.ui.IWorkbenchPartReference) - */ - @Override - public void partOpened(IWorkbenchPartReference partRef) { - if (partRef.getPart(false) == mapView) { - mapView.restoreState(); - - // get services - ISelectionService selection = PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getSelectionService(); - InstanceService instances = PlatformUI.getWorkbench().getService(InstanceService.class); - StyleService styles = PlatformUI.getWorkbench().getService(StyleService.class); - GeometrySchemaService geometries = PlatformUI.getWorkbench() - .getService(GeometrySchemaService.class); - - // update - updateScenePainters(selection); - - // add listeners - enableScenePainterListeners(selection, instances, styles, geometries); - - layoutController.enable(); - } - } - - /** - * Add the instance painters as listeners. - * - * @param selection the selection service - * @param instances the instance service - * @param styles the style service - * @param geometries the geometry schema service - */ - private void enableScenePainterListeners(ISelectionService selection, InstanceService instances, - StyleService styles, GeometrySchemaService geometries) { - for (AbstractInstancePainter painter : mapView.getMapKit() - .getTilePainters(AbstractInstancePainter.class)) { - selection.addSelectionListener(painter); - instances.addListener(painter); - styles.addListener(painter.getStyleListener()); - geometries.addListener(painter.getGeometryListener()); - } - } - - /** - * Update the instance painters. - * - * @param selection the selection service - */ - private void updateScenePainters(ISelectionService selection) { - for (AbstractInstancePainter painter : mapView.getMapKit() - .getTilePainters(AbstractInstancePainter.class)) { - painter.update(selection.getSelection()); - } - } - - /** - * Remove the instance painters as listeners. - * - * @param selection the selection service - * @param instances the instance service - * @param styles the style service - * @param geometries the geometry schema service - */ - private void disableScenePainterListeners(ISelectionService selection, - InstanceService instances, StyleService styles, GeometrySchemaService geometries) { - for (AbstractInstancePainter painter : mapView.getMapKit() - .getTilePainters(AbstractInstancePainter.class)) { - selection.removeSelectionListener(painter); - instances.removeListener(painter); - styles.removeListener(painter.getStyleListener()); - geometries.removeListener(painter.getGeometryListener()); - - painter.clearWaypoints(); - } - } - - /** - * @see IPartListener2#partActivated(IWorkbenchPartReference) - */ - @Override - public void partActivated(IWorkbenchPartReference partRef) { - // ignore - } - - /** - * @see IPartListener2#partBroughtToTop(IWorkbenchPartReference) - */ - @Override - public void partBroughtToTop(IWorkbenchPartReference partRef) { - // ignore - } - - /** - * @see IPartListener2#partHidden(IWorkbenchPartReference) - */ - @Override - public void partHidden(IWorkbenchPartReference partRef) { - // ignore - } - - /** - * @see IPartListener2#partVisible(IWorkbenchPartReference) - */ - @Override - public void partVisible(IWorkbenchPartReference partRef) { - // ignore - } - - /** - * @see IPartListener2#partDeactivated(org.eclipse.ui.IWorkbenchPartReference) - */ - @Override - public void partDeactivated(IWorkbenchPartReference partRef) { - // ignore - } - - /** - * @see IPartListener2#partInputChanged(org.eclipse.ui.IWorkbenchPartReference) - */ - @Override - public void partInputChanged(IWorkbenchPartReference partRef) { - // ignore - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/StyledMapPerspective.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/StyledMapPerspective.java deleted file mode 100644 index f53e061be2..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/StyledMapPerspective.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap; - -import org.eclipse.ui.IFolderLayout; -import org.eclipse.ui.IPageLayout; -import org.eclipse.ui.IPerspectiveFactory; - -import eu.esdihumboldt.hale.ui.views.data.SourceDataView; -import eu.esdihumboldt.hale.ui.views.data.TransformedDataView; - -/** - * Styled map perspective. - * - * @author Simon Templer - */ -public class StyledMapPerspective implements IPerspectiveFactory { - - /** - * The perspective identifier as registered in the application. - */ - public static final String ID = "eu.esdihumboldt.hale.ui.views.styledmap"; - - /** - * @see IPerspectiveFactory#createInitialLayout(IPageLayout) - */ - @Override - public void createInitialLayout(IPageLayout layout) { - String editorArea = layout.getEditorArea(); - // top - IFolderLayout top = layout.createFolder("top", IPageLayout.TOP, 0.7f, editorArea); - top.addView(StyledMapView.ID); - - // bottom left - IFolderLayout bottomLeft = layout.createFolder("bottomLeft", IPageLayout.BOTTOM, 0.7f, - editorArea); - bottomLeft.addView(SourceDataView.ID); - - // bottom right - IFolderLayout bottomRight = layout.createFolder("bottomRight", IPageLayout.RIGHT, 0.5f, - "bottomLeft"); - bottomRight.addView(TransformedDataView.ID); - - layout.setEditorAreaVisible(false); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/StyledMapUtil.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/StyledMapUtil.java deleted file mode 100644 index 7bd06094c1..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/StyledMapUtil.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap; - -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.mapviewer.GeoPosition; - -import de.fhg.igd.geom.BoundingBox; -import de.fhg.igd.mapviewer.BasicMapKit; -import de.fhg.igd.mapviewer.waypoints.SelectableWaypoint; -import eu.esdihumboldt.hale.common.instance.model.Instance; -import eu.esdihumboldt.hale.common.instance.model.InstanceReference; -import eu.esdihumboldt.hale.ui.service.instance.InstanceService; -import eu.esdihumboldt.hale.ui.views.styledmap.painter.AbstractInstancePainter; -import eu.esdihumboldt.hale.ui.views.styledmap.painter.InstanceWaypoint; - -/** - * Utility methods regarding the map view. - * - * @author Simon Templer - */ -public abstract class StyledMapUtil { - - /** - * Zoom to all instances available in the map. Does nothing if there are no - * instances displayed. - * - * @param mapKit the map kit - */ - public static void zoomToAll(BasicMapKit mapKit) { - BoundingBox bb = null; - - // determine bounding box - for (AbstractInstancePainter painter : mapKit - .getTilePainters(AbstractInstancePainter.class)) { - BoundingBox painterBB = painter.getBoundingBox(); - if (painterBB.checkIntegrity() && !painterBB.isEmpty()) { - if (bb == null) { - bb = new BoundingBox(painterBB); - } - else { - bb.add(painterBB); - } - } - } - - if (bb != null) { - Set positions = new HashSet(); - positions.add( - new GeoPosition(bb.getMinX(), bb.getMinY(), SelectableWaypoint.COMMON_EPSG)); - positions.add( - new GeoPosition(bb.getMaxX(), bb.getMaxY(), SelectableWaypoint.COMMON_EPSG)); - mapKit.zoomToPositions(positions); - } - } - - /** - * Zoom to the selected instances. Does nothing if the selection is empty or - * contains no {@link Instance}s or {@link InstanceReference}s. - * - * @param mapKit the map kit - * @param selection the selection - */ - public static void zoomToSelection(BasicMapKit mapKit, IStructuredSelection selection) { - BoundingBox bb = null; - - // determine bounding box for each reference and accumulate it - for (AbstractInstancePainter painter : mapKit - .getTilePainters(AbstractInstancePainter.class)) { - for (Object element : selection.toList()) { - InstanceReference ref = getReference(element); - if (ref != null) { - InstanceWaypoint wp = painter.findWaypoint(ref); - if (wp != null) { - BoundingBox wpBB = wp.getBoundingBox(); - if (wpBB.checkIntegrity() && !wpBB.isEmpty()) { - if (bb == null) { - bb = new BoundingBox(wpBB); - } - else { - bb.add(wpBB); - } - } - } - } - } - } - - if (bb != null) { - Set positions = new HashSet(); - positions.add( - new GeoPosition(bb.getMinX(), bb.getMinY(), SelectableWaypoint.COMMON_EPSG)); - positions.add( - new GeoPosition(bb.getMaxX(), bb.getMaxY(), SelectableWaypoint.COMMON_EPSG)); - mapKit.zoomToPositions(positions); - } - } - - private static InstanceReference getReference(Object element) { - if (element instanceof InstanceReference) { - return (InstanceReference) element; - } - if (element instanceof Instance) { - InstanceService is = PlatformUI.getWorkbench().getService(InstanceService.class); - is.getReference((Instance) element); - } - return null; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/StyledMapView.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/StyledMapView.java deleted file mode 100644 index 6792c46d51..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/StyledMapView.java +++ /dev/null @@ -1,253 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap; - -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.help.IContextProvider; -import org.eclipse.jface.action.Action; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.WorkbenchPart; - -import de.fhg.igd.mapviewer.view.MapView; -import eu.esdihumboldt.hale.common.instance.model.DataSet; -import eu.esdihumboldt.hale.common.instance.model.Instance; -import eu.esdihumboldt.hale.common.instance.model.InstanceReference; -import eu.esdihumboldt.hale.ui.HALEContextProvider; -import eu.esdihumboldt.hale.ui.HaleUI; -import eu.esdihumboldt.hale.ui.selection.InstanceSelection; -import eu.esdihumboldt.hale.ui.selection.impl.DefaultInstanceSelection; -import eu.esdihumboldt.hale.ui.util.ViewContextMenu; -import eu.esdihumboldt.hale.ui.views.styledmap.internal.StyledMapBundle; - -/** - * Extends map view with some functionality from PropertiesViewPart. - * - * @author Simon Templer - */ -public class StyledMapView extends MapView { - - /** - * Action that changes the selection to a set of given instances. - */ - public class SelectInstancesAction extends Action { - - private final List instances; - - /** - * Create an action the select the given instances. - * - * @param instances the instances to select, should be from the same - * data set - * @param dataSet the data set - */ - public SelectInstancesAction(List instances, DataSet dataSet) { - this.instances = instances; - - String instanceName; - String iconPath; - switch (dataSet) { - case TRANSFORMED: - instanceName = "transformed"; - iconPath = "icons/target.png"; - break; - case SOURCE: - default: - instanceName = "source"; - iconPath = "icons/source.png"; - } - - setText(MessageFormat.format("{0} {1} instance(s)", instances.size(), instanceName)); - setDescription(MessageFormat.format("Select only the {0} instances", instanceName)); - setImageDescriptor( - StyledMapBundle.imageDescriptorFromPlugin(StyledMapBundle.PLUGIN_ID, iconPath)); - } - - /** - * @see Action#run() - */ - @Override - public void run() { - getSite().getSelectionProvider().setSelection(new DefaultInstanceSelection(instances)); - } - - } - - /** - * The view ID - */ - public static final String ID = "eu.esdihumboldt.hale.ui.views.styledmap"; - - /** - * @see MapView#createPartControl(Composite) - */ - @Override - public void createPartControl(Composite parent) { - HaleUI.registerWorkbenchUndoRedo(getViewSite()); - - super.createPartControl(parent); - - Control mainControl = null; - - // try to get the Swing embedding composite - Control[] children = parent.getChildren(); - if (children != null && children.length > 0) { - for (Control child : children) { - // find based on class name (class from CityServer3D) - if (child.getClass().getSimpleName().equals("SwingComposite")) { - mainControl = child; - break; - } - } - if (mainControl == null) { - if (children.length >= 2) { - // Eclipse 4 - the first composite is the toolbar - mainControl = children[0]; - } - else { - mainControl = children[0]; - } - } - } - else { - mainControl = parent; - } - - new ViewContextMenu(getSite(), getSite().getSelectionProvider(), mainControl) { - - @Override - public void menuAboutToShow(IMenuManager manager) { - ISelection sel = getSite().getSelectionProvider().getSelection(); - - // show summary about selected instances - if (sel != null && !sel.isEmpty() && sel instanceof InstanceSelection) { - List source = new ArrayList(); - List transformed = new ArrayList(); - - for (Object object : ((InstanceSelection) sel).toArray()) { - DataSet ds = null; - if (object instanceof Instance) { - ds = ((Instance) object).getDataSet(); - } - if (object instanceof InstanceReference) { - ds = ((InstanceReference) object).getDataSet(); - } - if (ds != null) { - switch (ds) { - case SOURCE: - source.add(object); - break; - case TRANSFORMED: - transformed.add(object); - break; - } - } - } - - if (!source.isEmpty() || !transformed.isEmpty()) { - Action noAction = new Action("Selection:") { - // does nothing - }; - noAction.setEnabled(false); - manager.add(noAction); - } - - if (!source.isEmpty()) { - Action selectAction = new SelectInstancesAction(source, DataSet.SOURCE); - selectAction.setEnabled(!transformed.isEmpty()); - manager.add(selectAction); - } - if (!transformed.isEmpty()) { - Action selectAction = new SelectInstancesAction(transformed, - DataSet.TRANSFORMED); - selectAction.setEnabled(!source.isEmpty()); - manager.add(selectAction); - } - } - - super.menuAboutToShow(manager); - } - - }; - final Menu swtMenu = mainControl.getMenu(); - - getMapKit().getMainMap().addMouseListener(new MouseAdapter() { - - @Override - public void mousePressed(MouseEvent e) { - mouseReleased(e); - } - - @Override - public void mouseReleased(final MouseEvent e) { - if (e.isPopupTrigger()) { - PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { - - @Override - public void run() { - if (Platform.WS_GTK.equals(Platform.getWS())) { - /* - * Work-around (or rather hack) for Eclipse Bug - * 233450 - */ - GTKAWTBridgePopupFix.showMenu(swtMenu); - } - else { - swtMenu.setLocation(e.getXOnScreen(), e.getYOnScreen()); - swtMenu.setVisible(true); - } - } - - }); - } - } - - }); - } - - /** - * @see WorkbenchPart#getAdapter(Class) - */ - @SuppressWarnings("unchecked") - @Override - public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { - if (adapter.equals(IContextProvider.class)) { - return new HALEContextProvider(getSite().getSelectionProvider(), getViewContext()); - } - return super.getAdapter(adapter); - } - - /** - * Get the view's dynamic help context identifier. - * - * @return the context id or null - */ - protected String getViewContext() { - return "eu.esdihumboldt.hale.doc.user.views.styledmap.view"; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/Clip.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/Clip.java deleted file mode 100644 index fcdb421349..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/Clip.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip; - -import java.awt.Rectangle; -import java.awt.Shape; - -/** - * Interface for classes defining an algorithm to compute a clipping region. - * - * @author Simon Templer - */ -public interface Clip { - - /** - * Determine the clip region for painting. - * - * @param viewportBounds the view-port bounds (world pixel coordinates) - * @param originX the x position of the origin of the graphics to clip - * (world pixel coordinates) - * @param originY the y position of the origin of the graphics to clip - * (world pixel coordinates) - * @param width the graphics width - * @param height the graphics height - * @return the clip shape, or null if nothing should be painted - */ - public Shape getClip(Rectangle viewportBounds, int originX, int originY, int width, int height); - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/ClipPainter.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/ClipPainter.java deleted file mode 100644 index 9a884cd682..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/ClipPainter.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip; - -/** - * Enhancement interface for painters that support a clipping region. - * - * @author Simon Templer - */ -public interface ClipPainter { - - /** - * Set the clip algorithm. - * - * @param clip the clip algorithm - */ - public void setClip(Clip clip); - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/AbstractPolygonClip.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/AbstractPolygonClip.java deleted file mode 100644 index 5275377d83..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/AbstractPolygonClip.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.impl; - -import java.awt.Polygon; -import java.awt.Rectangle; -import java.awt.Shape; -import java.awt.geom.Area; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; - -/** - * Base class for clip's based on a polygon defined on the view-port. - * - * @author Simon Templer - */ -public abstract class AbstractPolygonClip implements Clip { - - /** - * @see Clip#getClip(Rectangle, int, int, int, int) - */ - @Override - public Shape getClip(Rectangle viewportBounds, int originX, int originY, int width, int height) { - // visible area in world pixel coordinates - Polygon visible = getVisiblePolygon(viewportBounds); - // visible area in local pixel coordinates - visible.translate(-originX, -originY); - // tile area - Rectangle tileRect = new Rectangle(0, 0, width, height); - - if (visible.contains(tileRect)) { - // contained whole - return tileRect; - } - else if (!visible.intersects(tileRect)) { - // don't paint - return null; - } - else { - // intersection - Area visibleArea = new Area(visible); - Area tileArea = new Area(tileRect); - - visibleArea.intersect(tileArea); - return visibleArea; - } - } - - /** - * Get the visible area. - * - * @param viewportBounds the view-port bounds - * @return the visible area in world pixel coordinates - */ - protected abstract Polygon getVisiblePolygon(Rectangle viewportBounds); - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/BottomLeftClip.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/BottomLeftClip.java deleted file mode 100644 index 570d306592..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/BottomLeftClip.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.impl; - -import java.awt.Polygon; -import java.awt.Rectangle; - -/** - * Diagonal clip for painting the bottom left area of the view-port. - * - * @author Simon Templer - */ -public class BottomLeftClip extends AbstractPolygonClip { - - /** - * @see AbstractPolygonClip#getVisiblePolygon(Rectangle) - */ - @Override - protected Polygon getVisiblePolygon(Rectangle viewportBounds) { - return new Polygon(new int[] { viewportBounds.x, viewportBounds.x + viewportBounds.width, - viewportBounds.x }, - new int[] { viewportBounds.y, viewportBounds.y + viewportBounds.height, - viewportBounds.y + viewportBounds.height }, 3); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/BottomRightClip.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/BottomRightClip.java deleted file mode 100644 index cbec1e4975..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/BottomRightClip.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.impl; - -import java.awt.Polygon; -import java.awt.Rectangle; - -/** - * Diagonal clip for painting the bottom right area of the view-port. - * - * @author Simon Templer - */ -public class BottomRightClip extends AbstractPolygonClip { - - /** - * @see AbstractPolygonClip#getVisiblePolygon(Rectangle) - */ - @Override - protected Polygon getVisiblePolygon(Rectangle viewportBounds) { - return new Polygon(new int[] { viewportBounds.x, viewportBounds.x + viewportBounds.width, - viewportBounds.x + viewportBounds.width }, new int[] { - viewportBounds.y + viewportBounds.height, viewportBounds.y, - viewportBounds.y + viewportBounds.height }, 3); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/Hide.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/Hide.java deleted file mode 100644 index 65ed46822e..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/Hide.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.impl; - -import java.awt.Rectangle; -import java.awt.Shape; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; - -/** - * Clip algorithm that forbids drawing. - * - * @author Simon Templer - */ -public class Hide implements Clip { - - private static Hide instance; - - /** - * Get the {@link Hide} instance. - * - * @return the instance - */ - public static Hide getInstance() { - if (instance == null) { - instance = new Hide(); - } - return instance; - } - - /** - * Default constructor - */ - private Hide() { - super(); - } - - /** - * @see Clip#getClip(Rectangle, int, int, int, int) - */ - @Override - public Shape getClip(Rectangle viewportBounds, int originX, int originY, int width, int height) { - // nothing should be painted - return null; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/HorizontalClip.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/HorizontalClip.java deleted file mode 100644 index 6217dc361b..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/HorizontalClip.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.impl; - -import java.awt.Rectangle; -import java.awt.Shape; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; - -/** - * Displays horizontal rows of the view-port. - * - * @author Simon Templer - */ -public class HorizontalClip implements Clip { - - private float top; - private float bottom; - - /** - * Create clip displaying a horizontal row. - * - * @param top the top of the row, value between 0 and 1, relative to the - * view-port height - * @param bottom the bottom of the row, value between 0 and 1, relative to - * the view-port height - */ - public HorizontalClip(float top, float bottom) { - super(); - this.top = (top <= bottom) ? (top) : (bottom); - this.bottom = (top <= bottom) ? (bottom) : (top); - } - - /** - * @see Clip#getClip(Rectangle, int, int, int, int) - */ - @Override - public Shape getClip(Rectangle viewportBounds, int originX, int originY, int width, int height) { - // row top and bottom in world pixel coordinates - int rowTop = (int) (viewportBounds.y + top * viewportBounds.height); - int rowBottom = (int) (viewportBounds.y + bottom * viewportBounds.height); - - // row top and bottom in local coordinates - rowTop -= originY; - rowBottom -= originY; - - if (rowBottom < 0) { - // tile is below row, paint nothing - return null; - } - - if (rowTop >= height) { - // tile is above row, paint nothing - return null; - } - - int y1 = Math.max(0, rowTop); - int y2 = Math.min(height, rowBottom); - - return new Rectangle(0, y1, width, y2 - y1); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/NoClip.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/NoClip.java deleted file mode 100644 index 3247f12763..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/NoClip.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.impl; - -import java.awt.Rectangle; -import java.awt.Shape; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; - -/** - * Clip algorithm that performs no clipping. - * - * @author Simon Templer - */ -public class NoClip implements Clip { - - private static NoClip instance; - - /** - * Get the {@link NoClip} instance. - * - * @return the instance - */ - public static NoClip getInstance() { - if (instance == null) { - instance = new NoClip(); - } - return instance; - } - - /** - * Default constructor - */ - private NoClip() { - super(); - } - - /** - * @see Clip#getClip(Rectangle, int, int, int, int) - */ - @Override - public Shape getClip(Rectangle viewportBounds, int originX, int originY, int width, int height) { - // no clipping, return the whole area - return new Rectangle(width, height); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/TopLeftClip.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/TopLeftClip.java deleted file mode 100644 index dfe9c5ea5d..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/TopLeftClip.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.impl; - -import java.awt.Polygon; -import java.awt.Rectangle; - -/** - * Diagonal clip for painting the top left area of the view-port. - * - * @author Simon Templer - */ -public class TopLeftClip extends AbstractPolygonClip { - - /** - * @see AbstractPolygonClip#getVisiblePolygon(Rectangle) - */ - @Override - protected Polygon getVisiblePolygon(Rectangle viewportBounds) { - return new Polygon(new int[] { viewportBounds.x, viewportBounds.x + viewportBounds.width, - viewportBounds.x }, new int[] { viewportBounds.y, viewportBounds.y, - viewportBounds.y + viewportBounds.height }, 3); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/TopRightClip.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/TopRightClip.java deleted file mode 100644 index af760b1db6..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/TopRightClip.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.impl; - -import java.awt.Polygon; -import java.awt.Rectangle; - -/** - * Diagonal clip for painting the top right area of the view-port. - * - * @author Simon Templer - */ -public class TopRightClip extends AbstractPolygonClip { - - /** - * @see AbstractPolygonClip#getVisiblePolygon(Rectangle) - */ - @Override - protected Polygon getVisiblePolygon(Rectangle viewportBounds) { - return new Polygon(new int[] { viewportBounds.x, viewportBounds.x + viewportBounds.width, - viewportBounds.x + viewportBounds.width }, new int[] { viewportBounds.y, - viewportBounds.y, viewportBounds.y + viewportBounds.height }, 3); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/VerticalClip.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/VerticalClip.java deleted file mode 100644 index f61467ee97..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/impl/VerticalClip.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.impl; - -import java.awt.Rectangle; -import java.awt.Shape; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; - -/** - * Displays a vertical column of the view-port. - * - * @author Simon Templer - */ -public class VerticalClip implements Clip { - - private float left; - private float right; - - /** - * Create clip displaying a vertical column. - * - * @param left the beginning of the column, value between 0 and 1, relative - * to the view-port width - * @param right the end of the column, value between 0 and 1, relative to - * the view-port width - */ - public VerticalClip(float left, float right) { - super(); - this.left = (left <= right) ? (left) : (right); - this.right = (left <= right) ? (right) : (left); - } - - /** - * @see Clip#getClip(Rectangle, int, int, int, int) - */ - @Override - public Shape getClip(Rectangle viewportBounds, int originX, int originY, int width, int height) { - // column left and right in world pixel coordinates - int colLeft = (int) (viewportBounds.x + left * viewportBounds.width); - int colRight = (int) (viewportBounds.x + right * viewportBounds.width); - - // column left and right in local coordinates - colLeft -= originX; - colRight -= originX; - - if (colRight < 0) { - // tile is after column, paint nothing - return null; - } - - if (colLeft >= height) { - // tile is before column, paint nothing - return null; - } - - int x1 = Math.max(0, colLeft); - int x2 = Math.min(height, colRight); - - return new Rectangle(x1, 0, x2 - x1, height); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/LayoutAugmentation.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/LayoutAugmentation.java deleted file mode 100644 index 4473799d13..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/LayoutAugmentation.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout; - -import java.awt.Graphics2D; -import java.util.List; - -import org.jdesktop.swingx.mapviewer.JXMapViewer; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterProxy; - -/** - * Paints an augmentation over a map layouted with the corresponding - * {@link PainterLayout}. - * - * @author Simon Templer - */ -public interface LayoutAugmentation { - - /** - * Paint the layout augmentation. - * - * @param g the graphics to paint on - * @param map the corresponding map viewer - * @param painters the list of layouted painters - * @param width the width of the paint area - * @param height the height of the paint area - */ - public void paint(Graphics2D g, JXMapViewer map, List painters, int width, - int height); - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/PainterLayout.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/PainterLayout.java deleted file mode 100644 index 29ca1d3445..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/PainterLayout.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout; - -import java.util.List; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; - -/** - * Painter layouts organize multiple painters on a map by assigning them - * clipping regions. - * - * @author Simon Templer - */ -public interface PainterLayout { - - /** - * Create clip algorithms for a given number of painters. - * - * @param count the number of painters to layout - * @return a clip for each painter to layout, it is also possible for an - * element to be null, which means no clipping should - * be applied to the corresponding painter. If the size of the list - * is smaller than count, the remaining painters should be disabled - */ - public List createClips(int count); - - /** - * Get the layout augmentation painter for a given number of painters. - * - * @param count the number of painters to layout - * @return the augmentation painter or null if there is none - * available - */ - public LayoutAugmentation getAugmentation(int count); - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/IconPainterLayoutContribution.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/IconPainterLayoutContribution.java deleted file mode 100644 index 023d43b044..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/IconPainterLayoutContribution.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension; - -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactoryCollection; -import de.fhg.igd.eclipse.util.extension.FactoryFilter; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; - -/** - * Only lists {@link PainterLayout}s with an associated icon. - * - * @author Simon Templer - */ -public class IconPainterLayoutContribution extends PainterLayoutContribution { - - /** - * Default constructor - */ - public IconPainterLayoutContribution() { - super(); - - setFilter(new FactoryFilter() { - - @Override - public boolean acceptFactory(PainterLayoutFactory factory) { - return factory.getIconURL() != null; - } - - @Override - public boolean acceptCollection( - ExtensionObjectFactoryCollection collection) { - return true; - } - }); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/LayoutAugmentationPainter.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/LayoutAugmentationPainter.java deleted file mode 100644 index f9817b0e49..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/LayoutAugmentationPainter.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension; - -import java.awt.Graphics2D; -import java.awt.Point; -import java.util.List; - -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.mapviewer.JXMapViewer; -import org.jdesktop.swingx.painter.AbstractPainter; - -import de.fhg.igd.eclipse.util.extension.exclusive.ExclusiveExtension.ExclusiveExtensionListener; -import de.fhg.igd.mapviewer.BasicMapKit; -import de.fhg.igd.mapviewer.MapPainter; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.LayoutAugmentation; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; - -/** - * Layout augmentation painer. - * - * @author Simon Templer - */ -public class LayoutAugmentationPainter extends AbstractPainterimplements MapPainter { - - /** - * The current layout augmentation - */ - private LayoutAugmentation augmentation; - - /** - * The painters controlled by the layout - */ - private List painters; - - private boolean initialized = false; - - private ExclusiveExtensionListener layoutListener; - - private BasicMapKit mapKit; - - /** - * Default constructor. - */ - public LayoutAugmentationPainter() { - super(); - - setCacheable(true); - } - - /** - * @see AbstractPainter#doPaint(Graphics2D, Object, int, int) - */ - @Override - public void doPaint(Graphics2D g, JXMapViewer map, int width, int height) { - init(); - - if (augmentation != null) { - augmentation.paint(g, map, painters, width, height); - } - } - - /** - * Initialize the painter - */ - private void init() { - if (initialized) { - return; - } - - PainterLayoutService pls = PlatformUI.getWorkbench().getService(PainterLayoutService.class); - - // get current configuration - if (pls.getCurrentDefinition() != null) { - painters = pls.getCurrentDefinition().getPaintersToLayout(); - augmentation = pls.getCurrent().getAugmentation(painters.size()); - } - else { - painters = null; - augmentation = null; - } - - pls.addListener( - layoutListener = new ExclusiveExtensionListener() { - - @Override - public void currentObjectChanged(PainterLayout current, - PainterLayoutFactory definition) { - if (definition != null) { - painters = definition.getPaintersToLayout(); - augmentation = current.getAugmentation(painters.size()); - } - else { - painters = null; - augmentation = null; - } - clearCache(); - if (mapKit != null) { - mapKit.refresh(); - } - - } - }); - - initialized = true; - clearCache(); - } - - /** - * @see MapPainter#setMapKit(BasicMapKit) - */ - @Override - public void setMapKit(BasicMapKit mapKit) { - this.mapKit = mapKit; - } - - /** - * @see MapPainter#getTipText(Point) - */ - @Override - public String getTipText(Point point) { - return null; - } - - /** - * @see MapPainter#dispose() - */ - @Override - public void dispose() { - if (layoutListener != null) { - PainterLayoutService pls = PlatformUI.getWorkbench() - .getService(PainterLayoutService.class); - pls.removeListener(layoutListener); - } - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterLayoutContribution.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterLayoutContribution.java deleted file mode 100644 index 7f5f281d98..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterLayoutContribution.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension; - -import org.eclipse.ui.PlatformUI; - -import de.fhg.igd.eclipse.ui.util.extension.AbstractExtensionContribution; -import de.fhg.igd.eclipse.ui.util.extension.exclusive.ExclusiveExtensionContribution; -import de.fhg.igd.eclipse.util.extension.exclusive.ExclusiveExtension; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; - -/** - * {@link PainterLayout} contribution - * - * @author Simon Templer - */ -public class PainterLayoutContribution - extends ExclusiveExtensionContribution { - - /** - * @see AbstractExtensionContribution#initExtension() - */ - @Override - protected ExclusiveExtension initExtension() { - return PlatformUI.getWorkbench().getService(PainterLayoutService.class); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterLayoutController.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterLayoutController.java deleted file mode 100644 index 0aee59f0ea..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterLayoutController.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension; - -import java.util.List; - -import org.eclipse.ui.PlatformUI; - -import de.fhg.igd.eclipse.util.extension.exclusive.ExclusiveExtension.ExclusiveExtensionListener; -import de.fhg.igd.mapviewer.BasicMapKit; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; - -/** - * TODO Type description - * - * @author Simon Templer - */ -public class PainterLayoutController { - - private final PainterLayoutService pls; - - private final ExclusiveExtensionListener layoutListener; - - private final BasicMapKit mapKit; - - /** - * Default constructor - * - * @param mapKit the map kit - */ - public PainterLayoutController(BasicMapKit mapKit) { - super(); - - this.mapKit = mapKit; - - pls = PlatformUI.getWorkbench().getService(PainterLayoutService.class); - - layoutListener = new ExclusiveExtensionListener() { - - @Override - public void currentObjectChanged(PainterLayout current, - PainterLayoutFactory definition) { - applyLayout(definition, current); - } - }; - } - - /** - * Enable the painter layout controller. - */ - public void enable() { - // apply current layout - applyLayout(pls.getCurrentDefinition(), pls.getCurrent()); - - // add listeners - pls.addListener(layoutListener); - } - - /** - * Disable the painter layout controller. - */ - public void disable() { - // remove listeners - pls.removeListener(layoutListener); - } - - /** - * Apply the current layout. - * - * @param currentDefinition the current definition - * @param current the current painter layout - */ - private void applyLayout(PainterLayoutFactory currentDefinition, PainterLayout current) { - List painters = currentDefinition.getPaintersToLayout(); - List clips = current.createClips(painters.size()); - - // apply clips - for (int i = 0; i < painters.size(); i++) { - PainterProxy painter = painters.get(i); - - if (i >= clips.size()) { - // no clip for proxy specified, disable the painter - // XXX instead do nothing? - painter.disable(); - } - else { - Clip clip = clips.get(i); - painter.enable(); - painter.setClip(clip); // XXX is this working even if the - // painter is not enabled (in time)? - } - } - - mapKit.refresh(); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterLayoutFactory.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterLayoutFactory.java deleted file mode 100644 index e5ef4f1598..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterLayoutFactory.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension; - -import java.util.List; - -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; - -/** - * Interface for {@link PainterLayout} factories - * - * @author Simon Templer - */ -public interface PainterLayoutFactory extends ExtensionObjectFactory { - - /** - * Get the painters to be layouted. - * - * @return a list with a proxy for each painter - */ - public List getPaintersToLayout(); - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterLayoutService.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterLayoutService.java deleted file mode 100644 index d7e75056be..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterLayoutService.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension; - -import de.fhg.igd.eclipse.util.extension.exclusive.ExclusiveExtension; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; - -/** - * Service managing {@link PainterLayout}s. - * - * @author Simon Templer - */ -public interface PainterLayoutService extends - ExclusiveExtension { - - // marker interface - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterProxy.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterProxy.java deleted file mode 100644 index 5354cea11e..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/PainterProxy.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.ClipPainter; - -/** - * Proxy for a painter that is to be layouted. - * - * @author Simon Templer - */ -public interface PainterProxy extends ClipPainter { - - /** - * Enable the painter. - */ - public void enable(); - - /** - * Disable the painter. - */ - public void disable(); - - /** - * Get the painter name. - * - * @return the painter name, null if not known - */ - public String getName(); - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/DefaultFactory.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/DefaultFactory.java deleted file mode 100644 index 4649100bcc..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/DefaultFactory.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.internal; - -import java.util.Collections; -import java.util.List; - -import de.fhg.igd.eclipse.util.extension.AbstractObjectFactory; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterLayoutFactory; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterProxy; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.impl.NoLayout; - -/** - * Default painter layout factory. Used as fall back in - * {@link PainterLayoutManager}. - * - * @author Simon Templer - */ -public class DefaultFactory extends AbstractObjectFactory implements - PainterLayoutFactory { - - @Override - public PainterLayout createExtensionObject() throws Exception { - return new NoLayout(); - } - - @Override - public void dispose(PainterLayout instance) { - // TODO ? - } - - @Override - public String getIdentifier() { - return "default"; - } - - /** - * @see ExtensionObjectDefinition#getDisplayName() - */ - @Override - public String getDisplayName() { - return "Default"; - } - - /** - * @see ExtensionObjectDefinition#getTypeName() - */ - @Override - public String getTypeName() { - return NoLayout.class.getName(); - } - - /** - * @see PainterLayoutFactory#getPaintersToLayout() - */ - @Override - public List getPaintersToLayout() { - // no painters to layout - return Collections.emptyList(); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/PainterLayoutExtension.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/PainterLayoutExtension.java deleted file mode 100644 index a8ea7713f6..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/PainterLayoutExtension.java +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.internal; - -import java.net.URL; -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.runtime.IConfigurationElement; - -import de.fhg.igd.eclipse.util.extension.AbstractConfigurationFactory; -import de.fhg.igd.eclipse.util.extension.AbstractExtension; -import de.fhg.igd.eclipse.util.extension.AbstractObjectDefinition; -import de.fhg.igd.eclipse.util.extension.AbstractObjectFactory; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectDefinition; -import de.fhg.igd.eclipse.util.extension.ExtensionObjectFactory; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterLayoutFactory; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterProxy; - -/** - * {@link PainterLayout} extension. - * - * @author Simon Templer - */ -public class PainterLayoutExtension extends AbstractExtension { - - /** - * {@link PainterLayout} factory based on an {@link IConfigurationElement}. - */ - public static class ConfigurationPainterLayoutFactory extends - AbstractConfigurationFactory implements PainterLayoutFactory { - - /** - * Create a {@link PainterLayout} factory based on the given - * configuration element. - * - * @param conf the configuration element - */ - protected ConfigurationPainterLayoutFactory(IConfigurationElement conf) { - super(conf, "class"); - } - - /** - * @see ExtensionObjectFactory#dispose(Object) - */ - @Override - public void dispose(PainterLayout instance) { - // TODO ? - } - - /** - * @see ExtensionObjectDefinition#getIdentifier() - */ - @Override - public String getIdentifier() { - return conf.getAttribute("id"); - } - - /** - * @see ExtensionObjectDefinition#getDisplayName() - */ - @Override - public String getDisplayName() { - return conf.getAttribute("name"); - } - - /** - * @see AbstractObjectFactory#getIconURL() - */ - @Override - public URL getIconURL() { - return getIconURL("icon"); - } - - /** - * @see PainterLayoutFactory#getPaintersToLayout() - */ - @Override - public List getPaintersToLayout() { - List proxies = new ArrayList(); - for (IConfigurationElement child : conf.getChildren()) { - if (child.getName().equals("tileoverlay")) { - proxies.add(new TileOverlayProxy(child.getAttribute("ref"))); - } - else { - // not supported - } - } - return proxies; - } - - /** - * @see AbstractObjectDefinition#getPriority() - */ - @Override - public int getPriority() { - String order = conf.getAttribute("order"); - - if (order != null) { - try { - return Integer.parseInt(order); - } catch (NumberFormatException e) { - // ignore, use default - } - } - - return super.getPriority(); - } - - } - - /** - * The extension point ID - */ - private static final String ID = "eu.esdihumboldt.hale.ui.views.styledmap.layout"; - - /** - * Default constructor - */ - public PainterLayoutExtension() { - super(ID); - } - - /** - * @see AbstractExtension#createFactory(IConfigurationElement) - */ - @Override - protected PainterLayoutFactory createFactory(IConfigurationElement conf) throws Exception { - return new ConfigurationPainterLayoutFactory(conf); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/PainterLayoutManager.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/PainterLayoutManager.java deleted file mode 100644 index e12b3a84f2..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/PainterLayoutManager.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.internal; - -import de.fhg.igd.eclipse.ui.util.extension.exclusive.PreferencesExclusiveExtension; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterLayoutFactory; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterLayoutService; -import eu.esdihumboldt.hale.ui.views.styledmap.internal.StyledMapBundle; -import eu.esdihumboldt.hale.ui.views.styledmap.preferences.StyledMapPreferenceConstants; - -/** - * Simon Templer - * - * @author Simon Templer - */ -public class PainterLayoutManager extends - PreferencesExclusiveExtension implements - PainterLayoutService { - - /** - * Default constructor. - */ - public PainterLayoutManager() { - super(new PainterLayoutExtension(), StyledMapBundle.getDefault().getPreferenceStore(), - StyledMapPreferenceConstants.CURRENT_MAP_LAYOUT); - } - - /** - * @see PreferencesExclusiveExtension#getFallbackFactory() - */ - @Override - protected PainterLayoutFactory getFallbackFactory() { - return new DefaultFactory(); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/PainterLayoutServiceFactory.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/PainterLayoutServiceFactory.java deleted file mode 100644 index ccb11d9601..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/PainterLayoutServiceFactory.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.internal; - -import org.eclipse.ui.services.AbstractServiceFactory; -import org.eclipse.ui.services.IServiceLocator; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterLayoutService; - -/** - * Service factory for the {@link PainterLayoutService}. - * - * @author Simon Templer - */ -public class PainterLayoutServiceFactory extends AbstractServiceFactory { - - @Override - public Object create(@SuppressWarnings("rawtypes") Class serviceInterface, - IServiceLocator parentLocator, IServiceLocator locator) { - if (PainterLayoutService.class.equals(serviceInterface)) { - return new PainterLayoutManager(); - } - - return null; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/TileOverlayProxy.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/TileOverlayProxy.java deleted file mode 100644 index b280f92f55..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/extension/internal/TileOverlayProxy.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.internal; - -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.mapviewer.TileOverlayPainter; - -import de.fhg.igd.mapviewer.view.overlay.ITileOverlayService; -import de.fhg.igd.mapviewer.view.overlay.TileOverlayFactory; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.ClipPainter; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterProxy; - -/** - * Proxy for a tile overlay painter. - * - * @author Simon Templer - */ -public class TileOverlayProxy implements PainterProxy { - - private final String id; - - /** - * Create a tile overlay painter proxy. - * - * @param id the tile overlay painter ID - */ - public TileOverlayProxy(String id) { - this.id = id; - } - - /** - * @see ClipPainter#setClip(Clip) - */ - @Override - public void setClip(Clip clip) { - ITileOverlayService tos = PlatformUI.getWorkbench().getService(ITileOverlayService.class); - - for (TileOverlayPainter painter : tos.getActiveObjects()) { - TileOverlayFactory def = tos.getDefinition(painter); - if (def.getIdentifier().equals(id)) { - if (painter instanceof ClipPainter) { - ((ClipPainter) painter).setClip(clip); - } - else { - // TODO warning - } - - break; - } - } - } - - /** - * @see PainterProxy#enable() - */ - @Override - public void enable() { - ITileOverlayService tos = PlatformUI.getWorkbench().getService(ITileOverlayService.class); - TileOverlayFactory def = tos.getFactory(id); - if (def != null) { - tos.activate(def); - } - } - - /** - * @see PainterProxy#disable() - */ - @Override - public void disable() { - ITileOverlayService tos = PlatformUI.getWorkbench().getService(ITileOverlayService.class); - TileOverlayFactory def = tos.getFactory(id); - if (def != null) { - tos.deactivate(def); - } - } - - /** - * @see PainterProxy#getName() - */ - @Override - public String getName() { - ITileOverlayService tos = PlatformUI.getWorkbench().getService(ITileOverlayService.class); - TileOverlayFactory def = tos.getFactory(id); - if (def != null) { - return def.getDisplayName(); - } - return null; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/AbstractDefaultAugmentation.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/AbstractDefaultAugmentation.java deleted file mode 100644 index 42bd9a693c..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/AbstractDefaultAugmentation.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.impl; - -import java.awt.BasicStroke; -import java.awt.Color; -import java.awt.Font; -import java.awt.Graphics2D; -import java.util.List; - -import org.jdesktop.swingx.mapviewer.JXMapViewer; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.LayoutAugmentation; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterProxy; - -/** - * Base class for layout augmentations. - * - * @author Simon Templer - */ -public abstract class AbstractDefaultAugmentation implements LayoutAugmentation { - - /** - * Default margin in pixels - */ - public static final int DEFAULT_MARGIN = 5; - - /** - * @see LayoutAugmentation#paint(Graphics2D, JXMapViewer, List, int, int) - */ - @Override - public final void paint(Graphics2D g, JXMapViewer map, List painters, int width, - int height) { - Font orgFont = g.getFont(); - g.setFont(getFont(orgFont)); - - doPaint(g, map, painters, width, height); - - g.setFont(orgFont); - } - - /** - * Paint the layout augmentation. - * - * @param g the graphics to paint on - * @param map the corresponding map viewer - * @param painters the list of layouted painters - * @param width the width of the paint area - * @param height the height of the paint area - */ - protected abstract void doPaint(Graphics2D g, JXMapViewer map, List painters, - int width, int height); - - /** - * Get the font to use for augmentation text. - * - * @param originalFont the original font applied to the graphics - * @return the font to use for the augmentation - */ - protected Font getFont(Font originalFont) { - return originalFont.deriveFont(Font.BOLD); - } - - /** - * Draw a text. - * - * @param g the graphics context - * @param text the text to draw - * @param x the x coordinate where the text should be rendered - * @param y the y coordinate where the text should be rendered - */ - protected void drawText(Graphics2D g, String text, int x, int y) { - if (text != null && !text.isEmpty()) { - g.setColor(Color.WHITE); - g.drawString(text, x - 1, y - 1); - g.drawString(text, x - 1, y + 1); - g.drawString(text, x + 1, y - 1); - g.drawString(text, x + 1, y + 1); - - g.setColor(Color.BLACK); - g.drawString(text, x, y); - } - } - - /** - * Draw a split line. - * - * @param g the graphics context - * @param x1 the x coordinate of the line start point - * @param y1 the y coordinate of the line start point - * @param x2 the x coordinate of the line end point - * @param y2 the y coordinate of the line end point - */ - protected void drawSplitLine(Graphics2D g, int x1, int y1, int x2, int y2) { - g.setColor(Color.WHITE); - g.setStroke(new BasicStroke(3)); - g.drawLine(x1, y1, x2, y2); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/ColumnLayout.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/ColumnLayout.java deleted file mode 100644 index 814d90c912..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/ColumnLayout.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.impl; - -import java.awt.Graphics2D; -import java.util.ArrayList; -import java.util.List; - -import org.jdesktop.swingx.mapviewer.JXMapViewer; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.impl.VerticalClip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.LayoutAugmentation; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterProxy; - -/** - * Layout that organizes painters in vertical columns. - * - * @author Simon Templer - */ -public class ColumnLayout implements PainterLayout { - - /** - * Row layout augmentation - */ - public static class ColumnAugmentation extends AbstractDefaultAugmentation { - - private final int count; - - /** - * Create a row layout augmentation. - * - * @param count the row count - */ - public ColumnAugmentation(int count) { - this.count = count; - } - - @Override - public void doPaint(Graphics2D g, JXMapViewer map, List painters, int width, - int height) { - // between each pair of columns... - for (int i = 1; i < count; i++) { - int x = (int) (i * width / (float) count); - - // ..draw the name of the top painter - if (i - 1 < painters.size()) { - String name = painters.get(i - 1).getName(); - drawText(g, name, x - DEFAULT_MARGIN - g.getFontMetrics().stringWidth(name), - height - DEFAULT_MARGIN); - } - - // ...draw a line - drawSplitLine(g, x, 0, x, height); - - // ..draw the name of the bottom painter - if (i < painters.size()) { - String name = painters.get(i).getName(); - drawText(g, name, x + DEFAULT_MARGIN, DEFAULT_MARGIN - + g.getFontMetrics().getAscent()); - } - } - } - - } - - /** - * @see PainterLayout#createClips(int) - */ - @Override - public List createClips(int count) { - List clips = new ArrayList(count); - float fCount = count; - - for (int i = 0; i < count; i++) { - float start = i / fCount; - float end = (i + 1) / fCount; - - clips.add(new VerticalClip(start, end)); - } - - return clips; - } - - /** - * @see PainterLayout#getAugmentation(int) - */ - @Override - public LayoutAugmentation getAugmentation(int count) { - return new ColumnAugmentation(count); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/DiagonalDownLayout.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/DiagonalDownLayout.java deleted file mode 100644 index 0aa054632f..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/DiagonalDownLayout.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.impl; - -import java.awt.Graphics2D; -import java.util.ArrayList; -import java.util.List; - -import org.jdesktop.swingx.mapviewer.JXMapViewer; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.impl.BottomLeftClip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.impl.TopRightClip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.LayoutAugmentation; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterProxy; - -/** - * Diagonal layout that splits the view-port in bottom-left and top-right. - * Supports only two painters, for additional painters no clip is provided. - * - * @author Simon Templer - */ -public class DiagonalDownLayout implements PainterLayout { - - /** - * @see PainterLayout#createClips(int) - */ - @Override - public List createClips(int count) { - List result = new ArrayList(); - result.add(new BottomLeftClip()); - result.add(new TopRightClip()); - return result; - } - - /** - * @see PainterLayout#getAugmentation(int) - */ - @Override - public LayoutAugmentation getAugmentation(int count) { - return new AbstractDefaultAugmentation() { - - @Override - protected void doPaint(Graphics2D g, JXMapViewer map, List painters, - int width, int height) { - drawSplitLine(g, 0, 0, width, height); - } - }; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/DiagonalUpLayout.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/DiagonalUpLayout.java deleted file mode 100644 index f692d7d60a..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/DiagonalUpLayout.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.impl; - -import java.awt.Graphics2D; -import java.util.ArrayList; -import java.util.List; - -import org.jdesktop.swingx.mapviewer.JXMapViewer; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.impl.BottomRightClip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.impl.TopLeftClip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.LayoutAugmentation; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterProxy; - -/** - * Diagonal layout that splits the view-port in top-left and bottom-right. - * Supports only two painters, for additional painters no clip is provided. - * - * @author Simon Templer - */ -public class DiagonalUpLayout implements PainterLayout { - - /** - * @see PainterLayout#createClips(int) - */ - @Override - public List createClips(int count) { - List result = new ArrayList(); - result.add(new TopLeftClip()); - result.add(new BottomRightClip()); - return result; - } - - /** - * @see PainterLayout#getAugmentation(int) - */ - @Override - public LayoutAugmentation getAugmentation(int count) { - return new AbstractDefaultAugmentation() { - - @Override - protected void doPaint(Graphics2D g, JXMapViewer map, List painters, - int width, int height) { - drawSplitLine(g, 0, height, width, 0); - } - }; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/NoLayout.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/NoLayout.java deleted file mode 100644 index 4e873ca966..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/NoLayout.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.impl; - -import java.util.ArrayList; -import java.util.List; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.LayoutAugmentation; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; - -/** - * Layout that allows all painters to be fully painted. - * - * @author Simon Templer - */ -public class NoLayout implements PainterLayout { - - /** - * @see PainterLayout#createClips(int) - */ - @Override - public List createClips(int count) { - List clips = new ArrayList(count); - for (int i = 0; i < count; i++) { - clips.add(null); // null is cleaner than NoClip - } - return clips; - } - - /** - * @see PainterLayout#getAugmentation(int) - */ - @Override - public LayoutAugmentation getAugmentation(int count) { - return null; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/OnlyFirstLayout.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/OnlyFirstLayout.java deleted file mode 100644 index 5d034046d0..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/OnlyFirstLayout.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.impl; - -import java.util.Collections; -import java.util.List; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.LayoutAugmentation; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; - -/** - * Layout that displays only the first painter. - * - * @author Simon Templer - */ -public class OnlyFirstLayout implements PainterLayout { - - /** - * @see PainterLayout#createClips(int) - */ - @Override - public List createClips(int count) { - return Collections.singletonList(null); - } - - /** - * @see PainterLayout#getAugmentation(int) - */ - @Override - public LayoutAugmentation getAugmentation(int count) { - return null; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/RowLayout.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/RowLayout.java deleted file mode 100644 index 0714b99c89..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/clip/layout/impl/RowLayout.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.impl; - -import java.awt.Graphics2D; -import java.util.ArrayList; -import java.util.List; - -import org.jdesktop.swingx.mapviewer.JXMapViewer; - -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.impl.HorizontalClip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.LayoutAugmentation; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.PainterLayout; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.PainterProxy; - -/** - * Layout that organizes painters in horizontal rows. - * - * @author Simon Templer - */ -public class RowLayout implements PainterLayout { - - /** - * Row layout augmentation - */ - public static class RowAugmentation extends AbstractDefaultAugmentation { - - private final int count; - - /** - * Create a row layout augmentation. - * - * @param count the row count - */ - public RowAugmentation(int count) { - this.count = count; - } - - @Override - public void doPaint(Graphics2D g, JXMapViewer map, List painters, int width, - int height) { - // between each pair of rows... - for (int i = 1; i < count; i++) { - int y = (int) (i * height / (float) count); - - // ..draw the name of the top painter - if (i - 1 < painters.size()) { - String name = painters.get(i - 1).getName(); - drawText(g, name, DEFAULT_MARGIN, y - DEFAULT_MARGIN); - } - - // ...draw a line - drawSplitLine(g, 0, y, width, y); - - // ..draw the name of the bottom painter - if (i < painters.size()) { - String name = painters.get(i).getName(); - drawText(g, name, - width - DEFAULT_MARGIN - g.getFontMetrics().stringWidth(name), y - + DEFAULT_MARGIN + g.getFontMetrics().getAscent()); - } - } - } - - } - - /** - * @see PainterLayout#createClips(int) - */ - @Override - public List createClips(int count) { - List clips = new ArrayList(count); - float fCount = count; - - for (int i = 0; i < count; i++) { - float start = i / fCount; - float end = (i + 1) / fCount; - - clips.add(new HorizontalClip(start, end)); - } - - return clips; - } - - /** - * @see PainterLayout#getAugmentation(int) - */ - @Override - public LayoutAugmentation getAugmentation(int count) { - return new RowAugmentation(count); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/handler/ShowLayoutMenuHandler.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/handler/ShowLayoutMenuHandler.java deleted file mode 100644 index 7cd2b9b14d..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/handler/ShowLayoutMenuHandler.java +++ /dev/null @@ -1,145 +0,0 @@ -/* - * Copyright (c) 2014 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.handler; - -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.commands.IHandler; -import org.eclipse.jface.action.IMenuListener; -import org.eclipse.jface.action.IMenuManager; -import org.eclipse.jface.action.MenuManager; -import org.eclipse.swt.events.MenuEvent; -import org.eclipse.swt.events.MenuListener; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Menu; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.ToolBar; -import org.eclipse.swt.widgets.ToolItem; -import org.eclipse.ui.IViewPart; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.WorkbenchException; -import org.eclipse.ui.handlers.HandlerUtil; - -import de.fhg.igd.mapviewer.view.MapView; -import de.fhg.igd.slf4jplus.ALogger; -import de.fhg.igd.slf4jplus.ALoggerFactory; -import eu.esdihumboldt.hale.ui.views.styledmap.StyledMapPerspective; -import eu.esdihumboldt.hale.ui.views.styledmap.StyledMapView; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.layout.extension.IconPainterLayoutContribution; - -/** - * Zooms to all instances present in the map. - * - * @author Simon Templer - */ -public class ShowLayoutMenuHandler extends AbstractHandler { - - private static final ALogger log = ALoggerFactory.getLogger(ShowLayoutMenuHandler.class); - - /** - * @see IHandler#execute(ExecutionEvent) - */ - @Override - public Object execute(ExecutionEvent event) throws ExecutionException { - IViewPart viewPart = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage() - .findView(StyledMapView.ID); - - if (viewPart instanceof MapView) { - // view visible - show layout menu - final MenuManager manager = new MenuManager(); - manager.setRemoveAllWhenShown(true); - final IconPainterLayoutContribution contribution = new IconPainterLayoutContribution(); - manager.addMenuListener(new IMenuListener() { - - @Override - public void menuAboutToShow(IMenuManager manager) { - // populate context menu - manager.add(contribution); - } - - }); - Shell shell = HandlerUtil.getActiveShell(event); - - final Menu menu = manager.createContextMenu(shell); - - // determine location - Point cursorLocation = Display.getCurrent().getCursorLocation(); - - // default to cursor location - Point location = cursorLocation; - - // try to determine from control - Control cursorControl = Display.getCurrent().getCursorControl(); - if (cursorControl != null) { - if (cursorControl instanceof ToolBar) { - ToolBar bar = (ToolBar) cursorControl; - ToolItem item = bar.getItem(bar.toControl(cursorLocation)); - if (item != null) { - Rectangle bounds = item.getBounds(); - location = bar.toDisplay(bounds.x, bounds.y + bounds.height); - } - } - else { - // show below control - location = cursorControl.toDisplay(0, cursorControl.getSize().y); - } - } - - menu.setLocation(location); - - menu.addMenuListener(new MenuListener() { - - @Override - public void menuShown(MenuEvent e) { - // do nothing - } - - @Override - public void menuHidden(MenuEvent e) { - Display.getCurrent().asyncExec(new Runnable() { - - @Override - public void run() { - /* - * Dispose everything as it is used only once. Done - * asynchronously as otherwise we interfere with the - * menu click handling. - */ - manager.dispose(); - contribution.dispose(); - menu.dispose(); - } - }); - } - }); - - // show menu - menu.setVisible(true); - } - else { - // view not visible - just show map perspective - try { - PlatformUI.getWorkbench().showPerspective(StyledMapPerspective.ID, - HandlerUtil.getActiveWorkbenchWindow(event)); - } catch (WorkbenchException e) { - log.error("Could not open map perspective", e); - } - } - - return null; - } -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/handler/ZoomToAllHandler.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/handler/ZoomToAllHandler.java deleted file mode 100644 index 706ce48db6..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/handler/ZoomToAllHandler.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.handler; - -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.commands.IHandler; -import org.eclipse.ui.IViewPart; -import org.eclipse.ui.handlers.HandlerUtil; - -import de.fhg.igd.mapviewer.view.MapView; -import eu.esdihumboldt.hale.ui.views.styledmap.StyledMapUtil; -import eu.esdihumboldt.hale.ui.views.styledmap.StyledMapView; - -/** - * Zooms to all instances present in the map. - * - * @author Simon Templer - */ -public class ZoomToAllHandler extends AbstractHandler { - - /** - * @see IHandler#execute(ExecutionEvent) - */ - @Override - public Object execute(ExecutionEvent event) throws ExecutionException { - IViewPart viewPart = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage() - .findView(StyledMapView.ID); - - if (viewPart instanceof MapView) { - StyledMapUtil.zoomToAll(((MapView) viewPart).getMapKit()); - } - - return null; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/handler/ZoomToSelectionHandler.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/handler/ZoomToSelectionHandler.java deleted file mode 100644 index d0ffb8e833..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/handler/ZoomToSelectionHandler.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.handler; - -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.commands.IHandler; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.ui.IViewPart; -import org.eclipse.ui.handlers.HandlerUtil; - -import de.fhg.igd.mapviewer.view.MapView; -import eu.esdihumboldt.hale.ui.views.styledmap.StyledMapUtil; -import eu.esdihumboldt.hale.ui.views.styledmap.StyledMapView; - -/** - * Zooms to selected instances. - * - * @author Simon Templer - */ -public class ZoomToSelectionHandler extends AbstractHandler { - - /** - * @see IHandler#execute(ExecutionEvent) - */ - @Override - public Object execute(ExecutionEvent event) throws ExecutionException { - IViewPart viewPart = HandlerUtil.getActiveWorkbenchWindow(event).getActivePage() - .findView(StyledMapView.ID); - ISelection selection = HandlerUtil.getCurrentSelection(event); - - if (viewPart instanceof MapView && selection instanceof IStructuredSelection) { - StyledMapUtil.zoomToSelection(((MapView) viewPart).getMapKit(), - (IStructuredSelection) selection); - } - - return null; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/internal/StyledMapBundle.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/internal/StyledMapBundle.java deleted file mode 100644 index 4ee78d4bf9..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/internal/StyledMapBundle.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.internal; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class StyledMapBundle extends AbstractUIPlugin { - - /** - * The plug-in ID - */ - public static final String PLUGIN_ID = "eu.esdihumboldt.hale.ui.views.styledmap"; //$NON-NLS-1$ - - // The shared instance - private static StyledMapBundle plugin; - - /** - * The constructor - */ - public StyledMapBundle() { - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext - * ) - */ - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext - * ) - */ - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static StyledMapBundle getDefault() { - return plugin; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/AbstractInstancePainter.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/AbstractInstancePainter.java deleted file mode 100644 index 4a5383b8b9..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/AbstractInstancePainter.java +++ /dev/null @@ -1,714 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.painter; - -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.Shape; -import java.awt.image.BufferedImage; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.ListIterator; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.swt.graphics.RGB; -import org.eclipse.ui.ISelectionListener; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.image.FastBlurFilter; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.PixelConverter; -import org.opengis.referencing.crs.CoordinateReferenceSystem; - -import org.locationtech.jts.geom.Geometry; - -import de.fhg.igd.geom.BoundingBox; -import de.fhg.igd.geom.Point3D; -import de.fhg.igd.mapviewer.AbstractTileOverlayPainter; -import de.fhg.igd.mapviewer.Refresher; -import de.fhg.igd.mapviewer.marker.Marker; -import de.fhg.igd.mapviewer.waypoints.GenericWaypoint; -import de.fhg.igd.mapviewer.waypoints.GenericWaypointPainter; -import de.fhg.igd.mapviewer.waypoints.MarkerWaypointRenderer; -import de.fhg.igd.slf4jplus.ALogger; -import de.fhg.igd.slf4jplus.ALoggerFactory; -import eu.esdihumboldt.hale.common.convert.ConversionUtil; -import eu.esdihumboldt.hale.common.instance.helper.PropertyResolver; -import eu.esdihumboldt.hale.common.instance.model.DataSet; -import eu.esdihumboldt.hale.common.instance.model.Instance; -import eu.esdihumboldt.hale.common.instance.model.InstanceCollection; -import eu.esdihumboldt.hale.common.instance.model.InstanceReference; -import eu.esdihumboldt.hale.common.instance.model.ResourceIterator; -import eu.esdihumboldt.hale.common.instance.model.impl.PseudoInstanceReference; -import eu.esdihumboldt.hale.common.schema.SchemaSpaceID; -import eu.esdihumboldt.hale.common.schema.geometry.GeometryProperty; -import eu.esdihumboldt.hale.common.schema.model.SchemaSpace; -import eu.esdihumboldt.hale.common.schema.model.TypeDefinition; -import eu.esdihumboldt.hale.ui.HaleUI; -import eu.esdihumboldt.hale.ui.common.service.style.StyleService; -import eu.esdihumboldt.hale.ui.common.service.style.StyleServiceListener; -import eu.esdihumboldt.hale.ui.geometry.DefaultGeometryUtil; -import eu.esdihumboldt.hale.ui.geometry.service.GeometrySchemaServiceListener; -import eu.esdihumboldt.hale.ui.selection.InstanceSelection; -import eu.esdihumboldt.hale.ui.selection.impl.DefaultInstanceSelection; -import eu.esdihumboldt.hale.ui.service.instance.InstanceService; -import eu.esdihumboldt.hale.ui.service.instance.InstanceServiceListener; -import eu.esdihumboldt.hale.ui.service.schema.SchemaService; -import eu.esdihumboldt.hale.ui.util.io.ThreadProgressMonitor; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.Clip; -import eu.esdihumboldt.hale.ui.views.styledmap.clip.ClipPainter; -import eu.esdihumboldt.hale.ui.views.styledmap.util.CRSConverter; -import eu.esdihumboldt.hale.ui.views.styledmap.util.CRSDecode; - -/** - * Abstract instance painter implementation based on an {@link InstanceService}. - * - * @author Simon Templer - */ -public abstract class AbstractInstancePainter - extends GenericWaypointPainter - implements InstanceServiceListener, ISelectionListener, ClipPainter { - - private static final ALogger log = ALoggerFactory.getLogger(AbstractInstancePainter.class); - - private static final double BUFFER_VALUE = 0.0125; - - /** - * The list of default paths searched in an instance for an instance name. - * Search is done in the given order. - */ - private static final String[] DEFAULT_NAME_PATHS = new String[] { "name", "id", "fid" }; - - private final InstanceService instanceService; - - private final DataSet dataSet; - - private CoordinateReferenceSystem waypointCRS; - - private Clip clip; - - private final StyleServiceListener styleListener; - - private final GeometrySchemaServiceListener geometryListener; - - private Set lastSelected = new HashSet(); - - /** - * Create an instance painter. - * - * @param instanceService the instance service - * @param dataSet the data set - */ - public AbstractInstancePainter(InstanceService instanceService, DataSet dataSet) { - super(new MarkerWaypointRenderer(), 4); // four worker - // threads - this.instanceService = instanceService; - this.dataSet = dataSet; - - styleListener = new StyleServiceListener() { - - @Override - public void stylesRemoved(StyleService styleService) { - styleRefresh(); - } - - @Override - public void stylesAdded(StyleService styleService) { - styleRefresh(); - } - - @Override - public void styleSettingsChanged(StyleService styleService) { - styleRefresh(); - } - - @Override - public void backgroundChanged(StyleService styleService, RGB background) { - // ignore, background not supported - } - }; - - geometryListener = new GeometrySchemaServiceListener() { - - @Override - public void defaultGeometryChanged(TypeDefinition type) { - SchemaService ss = PlatformUI.getWorkbench().getService(SchemaService.class); - SchemaSpaceID spaceID; - switch (getDataSet()) { - case TRANSFORMED: - spaceID = SchemaSpaceID.TARGET; - break; - case SOURCE: - spaceID = SchemaSpaceID.SOURCE; - break; - default: - throw new IllegalStateException("Illegal data set"); - } - SchemaSpace schemas = ss.getSchemas(spaceID); - if (schemas.getType(type.getName()) != null) { - // TODO only update way-points that are affected XXX save - // type def in way-point? - // XXX for now: recreate all - update(null); - } - } - }; - } - - /** - * Refresh with style update. - */ - protected void styleRefresh() { - for (InstanceWaypoint wp : iterateWaypoints()) { - Marker marker = wp.getMarker(); - if (marker instanceof StyledInstanceMarker) { - ((StyledInstanceMarker) marker).resetStyle(); - } - } - refreshAll(); - } - - /** - * @see InstanceServiceListener#datasetChanged(DataSet) - */ - @Override - public void datasetChanged(DataSet type) { - if (type == dataSet) { - update(null); - } - } - - /** - * Get the CRS for use in way-point bounding boxes. - * - * @return the way-point CRS - */ - public CoordinateReferenceSystem getWaypointCRS() { - if (waypointCRS == null) { - try { - waypointCRS = CRSDecode.getCRS(GenericWaypoint.COMMON_EPSG); - } catch (Throwable e) { - throw new IllegalStateException("Could not decode way-point CRS", e); - } - } - - return waypointCRS; - } - - /** - * Do a complete update of the way-points. Existing way-points are - * discarded. - * - * @param selection the current selection - */ - public void update(ISelection selection) { - clearWaypoints(); - - // XXX only mappable type instances for source?! - InstanceCollection instances = instanceService.getInstances(dataSet); - - if (selection != null) { - lastSelected = collectReferences(selection); - } - - if (instances.isEmpty()) { - return; - } - - final AtomicBoolean updateFinished = new AtomicBoolean(false); - IRunnableWithProgress op = new IRunnableWithProgress() { - - @Override - public void run(IProgressMonitor monitor) - throws InvocationTargetException, InterruptedException { - String taskName; - switch (getDataSet()) { - case SOURCE: - taskName = "Update source data in map"; - break; - case TRANSFORMED: - default: - taskName = "Update transformed data in map"; - break; - } - monitor.beginTask(taskName, IProgressMonitor.UNKNOWN); - - // add way-points for instances - InstanceCollection instances = instanceService.getInstances(dataSet); - ResourceIterator it = instances.iterator(); - try { - while (it.hasNext()) { - Instance instance = it.next(); - - InstanceWaypoint wp = createWaypoint(instance, instanceService); - - if (wp != null) { - if (lastSelected.contains(wp.getValue())) { - wp.setSelected(true, null); // refresh can be - // ignored because - // it's done for - // addWaypoint - } - addWaypoint(wp, null); // no refresher, as - // refreshAll is executed - } - } - } finally { - it.close(); - monitor.done(); - updateFinished.set(true); - } - } - }; - - try { - ThreadProgressMonitor.runWithProgressDialog(op, false); - } catch (Throwable e) { - log.error("Error running painter update", e); - } - - HaleUI.waitFor(updateFinished); - refreshAll(); - } - - /** - * Create a way-point for an instance - * - * @param instance the instance - * @param instanceService the instance service - * @return the created way-point or null if - */ - protected InstanceWaypoint createWaypoint(Instance instance, InstanceService instanceService) { - // retrieve instance reference - InstanceReference ref = instanceService.getReference(instance);// , - // getDataSet()); - - BoundingBox bb = null; - List> geometries = new ArrayList>( - DefaultGeometryUtil.getDefaultGeometries(instance)); - ListIterator> it = geometries.listIterator(); - while (it.hasNext()) { - GeometryProperty prop = it.next(); - - // check if geometry is valid for display in map - CoordinateReferenceSystem crs = (prop.getCRSDefinition() == null) ? (null) - : (prop.getCRSDefinition().getCRS()); - - if (crs == null) { - // no CRS, can't display in map - - // remove from list - it.remove(); - } - else { - Geometry geometry = prop.getGeometry(); - - // determine geometry bounding box - BoundingBox geometryBB = BoundingBox.compute(geometry); - - if (geometryBB == null) { - // no valid bounding box for geometry - it.remove(); - } - else { - try { - // get converter to way-point CRS - CRSConverter conv = CRSConverter.getConverter(crs, getWaypointCRS()); - - // convert BB to way-point SRS - geometryBB = conv.convert(geometryBB); - - // add to instance bounding box - if (bb == null) { - bb = new BoundingBox(geometryBB); - } - else { - bb.add(geometryBB); - } - } catch (Exception e) { - log.error("Error converting instance bounding box to waypoint bounding box", - e); - // ignore geometry - it.remove(); - } - } - } - } - - if (bb == null || geometries.isEmpty()) { - // don't create way-point w/o geometries - return null; - } - - // use bounding box center as GEO position - Point3D center = bb.getCenter(); - GeoPosition pos = new GeoPosition(center.getX(), center.getY(), - GenericWaypoint.COMMON_EPSG); - - // buffer bounding box if x or y dimension empty - if (bb.getMinX() == bb.getMaxX()) { - bb.setMinX(bb.getMinX() - BUFFER_VALUE); - bb.setMaxX(bb.getMaxX() + BUFFER_VALUE); - } - if (bb.getMinY() == bb.getMaxY()) { - bb.setMinY(bb.getMinY() - BUFFER_VALUE); - bb.setMaxY(bb.getMaxY() + BUFFER_VALUE); - } - - // set dummy z range (otherwise the RTree can't deal correctly with it) - bb.setMinZ(-BUFFER_VALUE); - bb.setMaxZ(BUFFER_VALUE); - - String name = findInstanceName(instance); - - // create the way-point - // XXX in abstract method? - InstanceWaypoint wp = new InstanceWaypoint(pos, bb, ref, geometries, - instance.getDefinition(), name); - - // each way-point must have its own marker, as the marker stores the - // marker areas - wp.setMarker(createMarker(wp)); - - return wp; - } - - /** - * Determine the name for the given instance. - * - * @param instance the instance - * @return the instance name or null if unknown - */ - private String findInstanceName(Instance instance) { - for (String namePath : DEFAULT_NAME_PATHS) { - Collection values = PropertyResolver.getValues(instance, namePath); - if (values != null) { - for (Object value : values) { - if (value instanceof Instance) { - value = ((Instance) value).getValue(); - } - - if (value != null) { - try { - String name = ConversionUtil.getAs(value, String.class); - if (name != null && !name.isEmpty()) { - return name; - } - } catch (Exception e) { - // ignore - } - } - } - } - } - - // no name found - return null; - } - - /** - * Create a new marker for a way-point. - * - * @param wp the way-point - * @return the marker - */ - private Marker createMarker(InstanceWaypoint wp) { -// return new InstanceMarker(); - return new StyledInstanceMarker(wp); - } - - /** - * @see AbstractTileOverlayPainter#getMaxOverlap() - */ - @Override - protected int getMaxOverlap() { - return 12; - } - - /** - * @return the instance service - */ - public InstanceService getInstanceService() { - return instanceService; - } - - /** - * @return the data set - */ - public DataSet getDataSet() { - return dataSet; - } - - /** - * Try to combine two selections. - * - * @param oldSelection the first selection - * @param newSelection the second selection - * @return the combined selection - */ - @SuppressWarnings("unchecked") - public static ISelection combineSelection(ISelection oldSelection, ISelection newSelection) { - if (newSelection == null) - return oldSelection; - else if (oldSelection == null) - return newSelection; - - if (oldSelection instanceof InstanceSelection - && newSelection instanceof InstanceSelection) { - // combine scene selections - Set values = new LinkedHashSet(); - - values.addAll(((InstanceSelection) oldSelection).toList()); - values.addAll(((InstanceSelection) newSelection).toList()); - - return new DefaultInstanceSelection(new ArrayList(values)); - } - else { - return newSelection; - } - } - - /** - * Selects the preferred selection. - * - * @param oldSelection the first selection - * @param newSelection the second selection - * @return the preferred selection - */ - public static ISelection preferSelection(ISelection oldSelection, ISelection newSelection) { - if (newSelection == null) - return oldSelection; - else if (oldSelection == null) - return newSelection; - - // FIXME decide on which basis? - - // XXX for now, always return the new selection - return newSelection; - } - - /** - * Get the selection for a given polygon on the screen. - * - * @param poly the polygon - * @return a selection or null - */ - public ISelection getSelection(java.awt.Polygon poly) { - Set wps = findWaypoints(poly); - return createSelection(wps); - } - - /** - * Get the selection for a given rectangle on the screen. - * - * @param rect the rectangle - * @return a selection or null - */ - public ISelection getSelection(Rectangle rect) { - Set wps = findWaypoints(rect); - return createSelection(wps); - } - - private ISelection createSelection(Set wps) { - if (wps != null && !wps.isEmpty()) { - List values = new ArrayList(wps.size()); - for (InstanceWaypoint wp : wps) { - values.add(wp.getValue()); - } - return new DefaultInstanceSelection(values); - } - - return null; - } - - /** - * Get the selection for the given point. - * - * @param point the point (viewport coordinates) - * @return a selection or null - */ - public ISelection getSelection(java.awt.Point point) { - InstanceWaypoint wp = findWaypoint(point); - if (wp != null) { - return new DefaultInstanceSelection(wp.getValue()); - } - return null; - } - - /** - * @see ISelectionListener#selectionChanged(IWorkbenchPart, ISelection) - */ - @Override - public void selectionChanged(IWorkbenchPart part, ISelection selection) { - if (!(selection instanceof InstanceSelection)) { - // only accept instance selections - return; - } - - // called when the selection has changed, to update the state of the - // way-points - Refresher refresh = prepareRefresh(false); - refresh.setImageOp(new FastBlurFilter(2)); - - // collect instance references that are in the new selection - Set selected = collectReferences(selection); - - Set toSelect = new HashSet(); - toSelect.addAll(selected); - toSelect.removeAll(lastSelected); - - // select all that previously have not been selected but are in the new - // selection - for (InstanceReference selRef : toSelect) { - InstanceWaypoint wp = findWaypoint(selRef); - if (wp != null) { - wp.setSelected(true, refresh); - } - } - - // unselect all that have previously been selected but are not in the - // new selection - lastSelected.removeAll(selected); - for (InstanceReference selRef : lastSelected) { - InstanceWaypoint wp = findWaypoint(selRef); - if (wp != null) { - wp.setSelected(false, refresh); - } - } - - lastSelected = selected; - - refresh.execute(); - } - - private Set collectReferences(ISelection selection) { - Set selected = new HashSet(); - if (selection instanceof IStructuredSelection) { - for (Object element : ((IStructuredSelection) selection).toList()) { - if (element instanceof InstanceReference) { - selected.add((InstanceReference) element); - } - else if (element instanceof Instance) { - Instance instance = (Instance) element; - InstanceReference ref; - try { - ref = instanceService.getReference(instance);// , - // dataSet); - } catch (IllegalArgumentException iae) { - // instance has no dataset set - ref = new PseudoInstanceReference(instance); - } - if (ref != null) { - selected.add(ref); - } - } - } - } - return selected; - } - - /** - * @see GenericWaypointPainter#clearWaypoints() - */ - @Override - public void clearWaypoints() { - super.clearWaypoints(); - - lastSelected.clear(); - } - - /** - * @return the styleListener - */ - public StyleServiceListener getStyleListener() { - return styleListener; - } - - /** - * @return the geometryListener - */ - public GeometrySchemaServiceListener getGeometryListener() { - return geometryListener; - } - - /** - * @see ClipPainter#setClip(Clip) - */ - @Override - public void setClip(Clip clip) { - this.clip = clip; - } - - /** - * @see AbstractTileOverlayPainter#drawOverlay(Graphics2D, BufferedImage, - * int, int, int, int, int, Rectangle, PixelConverter) - */ - @Override - protected void drawOverlay(Graphics2D gfx, BufferedImage img, int zoom, int tilePosX, - int tilePosY, int tileWidth, int tileHeight, Rectangle viewportBounds, - PixelConverter converter) { - if (clip == null) { - super.drawOverlay(gfx, img, zoom, tilePosX, tilePosY, tileWidth, tileHeight, - viewportBounds, converter); - } - else { - Shape clipShape = clip.getClip(viewportBounds, tilePosX, tilePosY, tileWidth, - tileHeight); - if (clipShape != null) { // drawing allowed - Shape orgClip = gfx.getClip(); - gfx.clip(clipShape); - super.drawOverlay(gfx, img, zoom, tilePosX, tilePosY, tileWidth, tileHeight, - viewportBounds, converter); - gfx.setClip(orgClip); - } - } - } - - /** - * @see GenericWaypointPainter#findWaypoint(Object) - */ - @Override - public InstanceWaypoint findWaypoint(InstanceReference object) { - return super.findWaypoint(object); - } - - /** - * @see InstanceServiceListener#transformationToggled(boolean) - */ - @Override - public void transformationToggled(boolean enabled) { - // ignore - } - - /** - * @see InstanceServiceListener#datasetAboutToChange(DataSet) - */ - @Override - public void datasetAboutToChange(DataSet type) { - // ignore - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/AdvancedBoxArea.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/AdvancedBoxArea.java deleted file mode 100644 index 83d4dddfb2..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/AdvancedBoxArea.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.painter; - -import de.fhg.igd.mapviewer.marker.area.Area; -import de.fhg.igd.mapviewer.marker.area.BoxArea; - -/** - * Create a box area where an AWT area provides a more accurate - * {@link #contains(int, int)}. - * - * @author Sebastian Reinhardt - */ -public class AdvancedBoxArea extends BoxArea { - - private final java.awt.geom.Area area; - - /** - * Create an area. - * - * @param area AWT area to use for the {@link #contains(int, int)} check - * @param minX the minimum x value of the area - * @param minY the minimum y value of the area - * @param maxX the maximum x value of the area - * @param maxY the maximum y value of the area - */ - public AdvancedBoxArea(java.awt.geom.Area area, int minX, int minY, int maxX, int maxY) { - super(minX, minY, maxX, maxY); - - this.area = area; - } - - /** - * @see Area#contains(int, int) - */ - @Override - public boolean contains(int x, int y) { - return area.contains(x, y); - } -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/AdvancedPolygonArea.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/AdvancedPolygonArea.java deleted file mode 100644 index de80f31598..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/AdvancedPolygonArea.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.painter; - -import java.awt.Polygon; - -import de.fhg.igd.mapviewer.marker.area.Area; -import de.fhg.igd.mapviewer.marker.area.PolygonArea; - -/** - * Create a polygon area where an AWT area provides a more accurate - * {@link #contains(int, int)}, e.g. for polygons with holes. - * - * @author Simon Templer - */ -public class AdvancedPolygonArea extends PolygonArea { - - private final java.awt.geom.Area area; - - /** - * Create a marker area. - * - * @param area the polygon area - * @param exterior the exterior polygon - */ - public AdvancedPolygonArea(java.awt.geom.Area area, Polygon exterior) { - super(exterior); - this.area = area; - } - - /** - * @see Area#contains(int, int) - */ - @Override - public boolean contains(int x, int y) { - return area.contains(x, y); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/DummyFeature.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/DummyFeature.java deleted file mode 100644 index 532802fa51..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/DummyFeature.java +++ /dev/null @@ -1,332 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.painter; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import org.opengis.feature.GeometryAttribute; -import org.opengis.feature.IllegalAttributeException; -import org.opengis.feature.Property; -import org.opengis.feature.simple.SimpleFeature; -import org.opengis.feature.simple.SimpleFeatureType; -import org.opengis.feature.type.AttributeDescriptor; -import org.opengis.feature.type.Name; -import org.opengis.filter.identity.FeatureId; -import org.opengis.geometry.BoundingBox; - -/** - * An empty Dummy class used to trick geotools Stylefactory wich only works with - * SimpleFeatures - * - * @author Sebastian Reinhardt - */ -public class DummyFeature implements SimpleFeature { - - /** - * @see org.opengis.feature.Feature#getBounds() - */ - @Override - public BoundingBox getBounds() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.Feature#getDefaultGeometryProperty() - */ - @Override - public GeometryAttribute getDefaultGeometryProperty() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.Feature#getIdentifier() - */ - @Override - public FeatureId getIdentifier() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.Feature#setDefaultGeometryProperty(org.opengis.feature.GeometryAttribute) - */ - @Override - public void setDefaultGeometryProperty(GeometryAttribute arg0) { - // TODO Auto-generated method stub - - } - - /** - * @see org.opengis.feature.ComplexAttribute#getProperties() - */ - @Override - public Collection getProperties() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.ComplexAttribute#getProperties(org.opengis.feature.type.Name) - */ - @Override - public Collection getProperties(Name arg0) { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.ComplexAttribute#getProperties(java.lang.String) - */ - @Override - public Collection getProperties(String arg0) { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.ComplexAttribute#getProperty(org.opengis.feature.type.Name) - */ - @Override - public Property getProperty(Name arg0) { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.ComplexAttribute#getProperty(java.lang.String) - */ - @Override - public Property getProperty(String arg0) { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.ComplexAttribute#getValue() - */ - @Override - public Collection getValue() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.ComplexAttribute#setValue(java.util.Collection) - */ - @Override - public void setValue(Collection arg0) { - // TODO Auto-generated method stub - - } - - /** - * @see org.opengis.feature.ComplexAttribute#validate() - */ - @Override - public void validate() throws IllegalAttributeException { - // TODO Auto-generated method stub - - } - - /** - * @see org.opengis.feature.Attribute#getDescriptor() - */ - @Override - public AttributeDescriptor getDescriptor() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.Property#getName() - */ - @Override - public Name getName() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.Property#getUserData() - */ - @Override - public Map getUserData() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.Property#isNillable() - */ - @Override - public boolean isNillable() { - // TODO Auto-generated method stub - return false; - } - - /** - * @see org.opengis.feature.Property#setValue(java.lang.Object) - */ - @Override - public void setValue(Object arg0) { - // TODO Auto-generated method stub - - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#getAttribute(java.lang.String) - */ - @Override - public Object getAttribute(String arg0) { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#getAttribute(org.opengis.feature.type.Name) - */ - @Override - public Object getAttribute(Name arg0) { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#getAttribute(int) - */ - @Override - public Object getAttribute(int arg0) throws IndexOutOfBoundsException { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#getAttributeCount() - */ - @Override - public int getAttributeCount() { - // TODO Auto-generated method stub - return 0; - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#getAttributes() - */ - @Override - public List getAttributes() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#getDefaultGeometry() - */ - @Override - public Object getDefaultGeometry() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#getFeatureType() - */ - @Override - public SimpleFeatureType getFeatureType() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#getID() - */ - @Override - public String getID() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#getType() - */ - @Override - public SimpleFeatureType getType() { - // TODO Auto-generated method stub - return null; - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#setAttribute(java.lang.String, - * java.lang.Object) - */ - @Override - public void setAttribute(String arg0, Object arg1) { - // TODO Auto-generated method stub - - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#setAttribute(org.opengis.feature.type.Name, - * java.lang.Object) - */ - @Override - public void setAttribute(Name arg0, Object arg1) { - // TODO Auto-generated method stub - - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#setAttribute(int, - * java.lang.Object) - */ - @Override - public void setAttribute(int arg0, Object arg1) throws IndexOutOfBoundsException { - // TODO Auto-generated method stub - - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#setAttributes(java.util.List) - */ - @Override - public void setAttributes(List arg0) { - // TODO Auto-generated method stub - - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#setAttributes(java.lang.Object[]) - */ - @Override - public void setAttributes(Object[] arg0) { - // TODO Auto-generated method stub - - } - - /** - * @see org.opengis.feature.simple.SimpleFeature#setDefaultGeometry(java.lang.Object) - */ - @Override - public void setDefaultGeometry(Object arg0) { - // TODO Auto-generated method stub - - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/InstanceMarker.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/InstanceMarker.java deleted file mode 100644 index dd6742ebcf..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/InstanceMarker.java +++ /dev/null @@ -1,644 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.painter; - -import java.awt.BasicStroke; -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.geom.Point2D; -import java.util.ArrayList; -import java.util.Collection; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; - -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.PixelConverter; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.operation.TransformException; - -import org.locationtech.jts.geom.Coordinate; -import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.geom.GeometryCollection; -import org.locationtech.jts.geom.GeometryFactory; -import org.locationtech.jts.geom.LineString; -import org.locationtech.jts.geom.Point; -import org.locationtech.jts.geom.Polygon; - -import de.fhg.igd.geom.BoundingBox; -import de.fhg.igd.geom.Point3D; -import de.fhg.igd.geom.shape.Line2D; -import de.fhg.igd.geom.shape.Surface; -import de.fhg.igd.mapviewer.marker.AbstractMarker; -import de.fhg.igd.mapviewer.marker.BoundingBoxMarker; -import de.fhg.igd.mapviewer.marker.Marker; -import de.fhg.igd.mapviewer.marker.SimpleCircleMarker; -import de.fhg.igd.mapviewer.marker.area.Area; -import de.fhg.igd.mapviewer.marker.area.MultiArea; -import de.fhg.igd.mapviewer.marker.area.PolygonArea; -import de.fhg.igd.mapviewer.waypoints.SelectableWaypoint; -import de.fhg.igd.slf4jplus.ALogger; -import de.fhg.igd.slf4jplus.ALoggerFactory; -import eu.esdihumboldt.hale.common.schema.geometry.CRSDefinition; -import eu.esdihumboldt.hale.common.schema.geometry.GeometryProperty; -import eu.esdihumboldt.hale.ui.style.StyleHelper; -import eu.esdihumboldt.hale.ui.style.service.internal.StylePreferences; -import eu.esdihumboldt.hale.ui.views.styledmap.util.CRSConverter; -import eu.esdihumboldt.hale.ui.views.styledmap.util.CRSDecode; - -/** - * Instance marker painter. - * - * @author Simon Templer - */ -@SuppressWarnings("restriction") -public class InstanceMarker extends BoundingBoxMarker { - - /** - * Get the geometry factory instance for internal usage. - * - * @return the geometry factory - */ - private static GeometryFactory getGeometryFactory() { - if (geometryFactory == null) { - geometryFactory = new GeometryFactory(); - } - return geometryFactory; - } - - private static final ALogger log = ALoggerFactory.getLogger(InstanceMarker.class); - - private static volatile GeometryFactory geometryFactory; - - /** - * Overlap for geometry pixel bounding boxes when checking against graphics - * bounds. - */ - private static final int GEOMETRY_PIXEL_BB_OVERLAP = 5; - - private final int defaultPointSize = 7; - - /** - * Cache for geometry bounding boxes in the map CRS. Will be cleared on map - * change. - */ - private final Map geometryMapBBs = new IdentityHashMap(); - - /** - * @see AbstractMarker#reset() - */ - @Override - public void reset() { - synchronized (geometryMapBBs) { - geometryMapBBs.clear(); - } - - super.reset(); - } - - /** - * Reset the marker areas. - */ - protected void areaReset() { - super.reset(); - } - - /** - * @see BoundingBoxMarker#doPaintMarker(Graphics2D, SelectableWaypoint, - * PixelConverter, int, int, int, int, int, Rectangle, boolean) - */ - @Override - protected Area doPaintMarker(Graphics2D g, InstanceWaypoint context, PixelConverter converter, - int zoom, int minX, int minY, int maxX, int maxY, Rectangle gBounds, - boolean calulateArea) { - List areas = (!calulateArea) ? (null) : (new ArrayList()); - - List> geometries = context.getGeometries(); - - // map CRS - CoordinateReferenceSystem mapCRS; - try { - mapCRS = CRSDecode.getLonLatCRS(converter.getMapEpsg()); - // map (GeoPosition) assumes lon/lat order - } catch (Throwable e) { - log.error("Could not decode map CRS", e); - return null; - } - - // paint each geometry - for (GeometryProperty geometry : geometries) { - Area geometryArea = paintGeometry(g, geometry.getCRSDefinition(), - geometry.getGeometry(), context, converter, zoom, geometries.size() == 1, - gBounds, mapCRS, calulateArea); - if (areas != null && geometryArea != null) { - areas.add(geometryArea); - } - } - - if (areas == null) { - return null; - } - if (areas.size() == 1) { - return areas.get(0); - } - else if (!areas.isEmpty()) { - return new MultiArea(areas); - } - - return null; - } - - /** - * Paint a geometry. - * - * @param g the graphics to paint on - * @param crsDefinition the CRS definition associated with the geometry - * @param geometry the geometry - * @param context the context - * @param converter the pixel converter - * @param zoom the zoom level - * @param singleGeometry if this is the only geometry associated to the - * marker - * @param gBounds the graphics bounds - * @param mapCRS the map coordinate reference system - * @param calculateArea if the area representing the marker should be - * calculated, if false is given here the return - * value is ignored and should be null - * @return the area the geometry occupies (in pixel coordinates), or - * null if nothing has been painted - */ - protected Area paintGeometry(Graphics2D g, CRSDefinition crsDefinition, Geometry geometry, - InstanceWaypoint context, PixelConverter converter, int zoom, boolean singleGeometry, - Rectangle gBounds, CoordinateReferenceSystem mapCRS, boolean calculateArea) { - if (geometry instanceof GeometryCollection) { - // paint each geometry in a geometry collection - List areas = (calculateArea) ? (new ArrayList()) : (null); - GeometryCollection collection = (GeometryCollection) geometry; - for (int i = 0; i < collection.getNumGeometries(); i++) { - Geometry geom = collection.getGeometryN(i); - Area geomArea = paintGeometry(g, crsDefinition, geom, context, converter, zoom, - singleGeometry && collection.getNumGeometries() == 1, gBounds, mapCRS, - calculateArea); - if (areas != null && geomArea != null) { - areas.add(geomArea); - } - } - if (areas == null || areas.isEmpty()) { - return null; - } - else { - return new MultiArea(areas); - } - } - - // check if geometry lies inside tile - // if the area must be calculated we must process all geometries - // if it is the only geometry the check that was already made is OK - if (!calculateArea && !singleGeometry) { - // we can safely return null inside this method, as no area has to - // be calculated - - // determine bounding box - BoundingBox geometryBB; - synchronized (geometryMapBBs) { - // retrieve cached bounding box - geometryBB = geometryMapBBs.get(geometry); - if (geometryBB == null) { - // if none available, try to calculate BB - BoundingBox calcBB = BoundingBox.compute(geometry); - if (calcBB != null && calcBB.checkIntegrity()) { - try { - // get CRS converter - CRSConverter conv = CRSConverter.getConverter(crsDefinition.getCRS(), - mapCRS); - - // manually convert to map CRS - geometryBB = conv.convert(calcBB); - - // put BB in cache - geometryMapBBs.put(geometry, geometryBB); - } catch (Throwable e) { - log.error("Error checking geometry bounding box", e); - return null; - } - } - } - } - - if (geometryBB != null) { - try { - GeoPosition minCorner = new GeoPosition(geometryBB.getMinX(), - geometryBB.getMinY(), converter.getMapEpsg()); - GeoPosition maxCorner = new GeoPosition(geometryBB.getMaxX(), - geometryBB.getMaxY(), converter.getMapEpsg()); - - // determine pixel coordinates - Point2D minPixels = converter.geoToPixel(minCorner, zoom); - Point2D maxPixels = converter.geoToPixel(maxCorner, zoom); - - // geometry pixel bounding box - int minX = Math.min((int) minPixels.getX(), (int) maxPixels.getX()); - int minY = Math.min((int) minPixels.getY(), (int) maxPixels.getY()); - int maxX = Math.max((int) minPixels.getX(), (int) maxPixels.getX()); - int maxY = Math.max((int) minPixels.getY(), (int) maxPixels.getY()); - // add overlap - minX -= GEOMETRY_PIXEL_BB_OVERLAP; - minY -= GEOMETRY_PIXEL_BB_OVERLAP; - maxX += GEOMETRY_PIXEL_BB_OVERLAP; - maxY += GEOMETRY_PIXEL_BB_OVERLAP; - // create bounding box - Rectangle geometryPixelBB = new Rectangle(minX, minY, maxX - minX, maxY - minY); - - if (!gBounds.intersects(geometryPixelBB) - && !gBounds.contains(geometryPixelBB)) { - // geometry does not lie in tile - return null; - } - } catch (Throwable e) { - log.error("Error checking geometry bounding box", e); - return null; - } - } - else { - return null; // empty or invalid bounding box - } - } - - if (geometry instanceof Point) { - return paintPoint((Point) geometry, g, crsDefinition, context, converter, zoom, mapCRS, - calculateArea); - } - - if (geometry instanceof Polygon) { - return paintPolygon((Polygon) geometry, g, crsDefinition, context, converter, zoom, - mapCRS, calculateArea); - } - -// if (geometry instanceof LinearRing) { -// //TODO any special handling needed? -// } - - if (geometry instanceof LineString) { - return paintLine((LineString) geometry, g, crsDefinition, context, converter, zoom, - mapCRS, calculateArea); - } - - return null; - } - - /** - * Paint a point geometry. - * - * @param geometry the point - * @param g the graphics object to paint on - * @param crsDefinition the CRS definition associated to the geometry - * @param context the context - * @param converter the pixel converter - * @param zoom the zoom level - * @param mapCRS the map coordinate reference system - * @param calculateArea if the area representing the marker should be - * calculated, if false is given here the return - * value is ignored and should be null - * @return the point marker area or null if painting failed - */ - protected Area paintPoint(Point geometry, Graphics2D g, CRSDefinition crsDefinition, - InstanceWaypoint context, PixelConverter converter, int zoom, - CoordinateReferenceSystem mapCRS, boolean calculateArea) { - try { - /* - * Conversion to map pixel coordinates: Though most of the time the - * result will be the origin (0,0), e.g. for way-points representing - * a single point, the coordinates may also be different, e.g. for - * MultiPoint way-points. - */ - - // get CRS converter - CRSConverter conv = CRSConverter.getConverter(crsDefinition.getCRS(), mapCRS); - - // manually convert to map CRS - Point3D mapPoint = conv.convert(geometry.getX(), geometry.getY(), 0); - - GeoPosition pos = new GeoPosition(mapPoint.getX(), mapPoint.getY(), - converter.getMapEpsg()); - // determine pixel coordinates - Point2D point = converter.geoToPixel(pos, zoom); - - int x = (int) point.getX(); - int y = (int) point.getY(); - - // TODO support style - - // fall-back: circle - if (applyFill(g, context)) { - g.fillOval(x - defaultPointSize / 2, y - defaultPointSize / 2, defaultPointSize, - defaultPointSize); - } - - if (applyStroke(g, context)) { - // TODO respect stroke width? - g.drawOval(x - defaultPointSize / 2 - 1, y - defaultPointSize / 2 - 1, - defaultPointSize + 1, defaultPointSize + 1); - } - - if (calculateArea) { - return new PolygonArea(new java.awt.Polygon( - new int[] { x - defaultPointSize / 2 - 1, x + defaultPointSize / 2 + 1, - x + defaultPointSize / 2 + 1, x - defaultPointSize / 2 - 1 }, - new int[] { y - defaultPointSize / 2 - 1, y - defaultPointSize / 2 - 1, - y + defaultPointSize / 2 + 1, y + defaultPointSize / 2 + 1 }, - 4)); - } - else { - return null; - } - } catch (Exception e) { - log.error("Error painting instance point geometry", e); - return null; - } - } - - /** - * Paint a polygon geometry. - * - * @param geometry the polygon - * @param g the graphics object to paint on - * @param crsDefinition the CRS definition associated to the geometry - * @param context the context - * @param converter the pixel converter - * @param zoom the zoom level - * @param mapCRS the map coordinate reference system - * @param calculateArea if the area representing the marker should be - * calculated, if false is given here the return - * value is ignored and should be null - * @return the polygon area or null if painting failed - */ - protected Area paintPolygon(Polygon geometry, Graphics2D g, CRSDefinition crsDefinition, - InstanceWaypoint context, PixelConverter converter, int zoom, - CoordinateReferenceSystem mapCRS, boolean calculateArea) { - try { - // get CRS converter - CRSConverter conv = CRSConverter.getConverter(crsDefinition.getCRS(), mapCRS); - - // exterior - Coordinate[] coordinates = geometry.getExteriorRing().getCoordinates(); - java.awt.Polygon outerPolygon = createPolygon(coordinates, conv, converter, zoom); - - if (geometry.getNumInteriorRing() > 0) { - // polygon has interior geometries - - java.awt.geom.Area drawArea = new java.awt.geom.Area(outerPolygon); - - // interior - for (int i = 0; i < geometry.getNumInteriorRing(); i++) { - LineString interior = geometry.getInteriorRingN(i); - java.awt.Polygon innerPolygon = createPolygon(interior.getCoordinates(), conv, - converter, zoom); - drawArea.subtract(new java.awt.geom.Area(innerPolygon)); - } - - if (applyFill(g, context)) { - g.fill(drawArea); - } - - if (applyStroke(g, context)) { - g.draw(drawArea); - } - - if (calculateArea) { - return new AdvancedPolygonArea(drawArea, outerPolygon); - } - } - else { - // polygon has no interior - // use polygon instead of Area for painting, as painting small - // Areas sometimes produces strange results (some are not - // visible) - if (applyFill(g, context)) { - g.fill(outerPolygon); - } - - if (applyStroke(g, context)) { - g.draw(outerPolygon); - } - - if (calculateArea) { - return new PolygonArea(outerPolygon); - } - } - - return null; // no calculateArea set - } catch (Exception e) { - log.error("Error painting instance polygon geometry", e); - return null; - } - } - - private java.awt.Polygon createPolygon(Coordinate[] coordinates, CRSConverter geoConverter, - PixelConverter pixelConverter, int zoom) - throws TransformException, IllegalGeoPositionException { - java.awt.Polygon result = new java.awt.Polygon(); - for (Coordinate coord : coordinates) { - // manually convert to map CRS - Point3D mapPoint = geoConverter.convert(coord.x, coord.y, 0); - - GeoPosition pos = new GeoPosition(mapPoint.getX(), mapPoint.getY(), - pixelConverter.getMapEpsg()); - Point2D point = pixelConverter.geoToPixel(pos, zoom); - - result.addPoint((int) point.getX(), (int) point.getY()); - } - return result; - } - - /** - * Paint a line string geometry. - * - * @param geometry the line string - * @param g the graphics object to paint on - * @param crsDefinition the CRS definition associated to the geometry - * @param context the context - * @param converter the pixel converter - * @param zoom the zoom level - * @param mapCRS the map coordinate reference system - * @param calculateArea if the area representing the marker should be - * calculated, if false is given here the return - * value is ignored and should be null - * @return the polygon area or null if painting failed - */ - protected Area paintLine(LineString geometry, Graphics2D g, CRSDefinition crsDefinition, - InstanceWaypoint context, PixelConverter converter, int zoom, - CoordinateReferenceSystem mapCRS, boolean calculateArea) { - Coordinate[] coordinates = geometry.getCoordinates(); - if (coordinates.length <= 0) { - return null; - } - if (coordinates.length == 1) { - // fall back to point drawing - Point point = getGeometryFactory().createPoint(coordinates[0]); - return paintPoint(point, g, crsDefinition, context, converter, zoom, mapCRS, - calculateArea); - } - - try { - // get CRS converter - CRSConverter conv = CRSConverter.getConverter(crsDefinition.getCRS(), mapCRS); - - List mapPoints = new ArrayList(coordinates.length); - for (Coordinate coord : coordinates) { - // manually convert to map CRS - Point3D mapPoint = conv.convert(coord.x, coord.y, 0); - - GeoPosition pos = new GeoPosition(mapPoint.getX(), mapPoint.getY(), - converter.getMapEpsg()); - Point2D point = converter.geoToPixel(pos, zoom); - - mapPoints.add(point); - } - - if (applyStroke(g, context)) { - for (int i = 0; i < mapPoints.size() - 1; i++) { - // draw each connecting line - Point2D p1 = mapPoints.get(i); - Point2D p2 = mapPoints.get(i + 1); - g.drawLine((int) p1.getX(), (int) p1.getY(), (int) p2.getX(), (int) p2.getY()); - } - } - else { - log.warn("Stroke disabled in style, LineString is not rendered"); - } - - if (!calculateArea) { - return null; - } - - // use a buffer around the line as area - java.awt.Polygon[] buffer = createBufferPolygon(mapPoints, 3); // XXX - // buffer - // size - // is - // in - // pixels, - // which - // value - // is - // ok? - if (buffer.length == 0) { - return null; - } - else if (buffer.length == 1) { - return new PolygonArea(buffer[0]); - } - else { - Collection areas = new ArrayList(); - for (java.awt.Polygon bufferPoly : buffer) { - areas.add(new PolygonArea(bufferPoly)); - } - return new MultiArea(areas); - } - } catch (Exception e) { - log.error("Error painting instance polygon geometry", e); - return null; - } - } - - /** - * Create a buffered polygon for the given line and a distance. - * - * @param linePoints the points defining the line - * @param distance the buffer size - * @return the buffer polygon(s) - */ - private static java.awt.Polygon[] createBufferPolygon(List linePoints, - double distance) { - // create metamodel line - de.fhg.igd.geom.Point2D[] convertedLinePoints = new de.fhg.igd.geom.Point2D[linePoints - .size()]; - - int index = 0; - for (Point2D point : linePoints) { - convertedLinePoints[index] = new de.fhg.igd.geom.Point2D(point.getX(), point.getY()); - index++; - } - - Line2D line = new Line2D(convertedLinePoints); - - Surface buffer = line.computeBuffer(distance); - return buffer.toAWTPolygons(1, 1, new de.fhg.igd.geom.Point2D(0, 0)); - } - - /** - * @see BoundingBoxMarker#getFallbackMarker(SelectableWaypoint) - */ - @Override - protected Marker getFallbackMarker(InstanceWaypoint context) { - return new SimpleCircleMarker(7, getPaintColor(context), getBorderColor(context), - Color.BLACK, false); - } - - /** - * @see BoundingBoxMarker#getPaintColor(SelectableWaypoint) - */ - @Override - protected Color getPaintColor(InstanceWaypoint context) { - // default color with applied transparency - Color color = getBorderColor(context); - return new Color(color.getRed(), color.getGreen(), color.getRed(), - (int) (255 * StyleHelper.DEFAULT_FILL_OPACITY)); - } - - /** - * Get the stroke for drawing lines. - * - * @param context the context - * @return the stroke - */ - protected java.awt.Stroke getLineStroke(InstanceWaypoint context) { - if (context.isSelected()) { - return new BasicStroke(StylePreferences.getSelectionWidth()); - } - else { - return new BasicStroke(StylePreferences.getDefaultWidth()); - } - } - - /** - * @see BoundingBoxMarker#applyStroke(Graphics2D, SelectableWaypoint) - */ - @Override - protected boolean applyStroke(Graphics2D g, InstanceWaypoint context) { - g.setStroke(getLineStroke(context)); - g.setColor(getBorderColor(context)); - - return true; - } - - /** - * @see BoundingBoxMarker#getBorderColor(SelectableWaypoint) - */ - @Override - protected Color getBorderColor(InstanceWaypoint context) { - if (context.isSelected()) { - // get selection color - return StylePreferences.getSelectionColor(); - } - // get default color - return StylePreferences.getDefaultColor(context.getValue().getDataSet()); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/InstanceWaypoint.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/InstanceWaypoint.java deleted file mode 100644 index 336cf41376..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/InstanceWaypoint.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.painter; - -import java.util.List; - -import org.jdesktop.swingx.mapviewer.GeoPosition; - -import de.fhg.igd.geom.BoundingBox; -import de.fhg.igd.mapviewer.waypoints.GenericWaypoint; -import eu.esdihumboldt.hale.common.instance.model.Instance; -import eu.esdihumboldt.hale.common.instance.model.InstanceReference; -import eu.esdihumboldt.hale.common.schema.geometry.GeometryProperty; -import eu.esdihumboldt.hale.common.schema.model.TypeDefinition; - -/** - * Map way-point representing an {@link Instance}. - * - * @author Simon Templer - */ -public class InstanceWaypoint extends GenericWaypoint { - - private final List> geometries; - - private final String name; - - private final TypeDefinition instanceType; - - /** - * Create an instance way-point. - * - * @param pos the way-point position - * @param bb the bounding box - * @param value the reference to the instance - * @param geometries the instance geometries - * @param instanceType the type definition associated with the instance - * @param name the instance name, null if unknown - */ - public InstanceWaypoint(GeoPosition pos, BoundingBox bb, InstanceReference value, - List> geometries, TypeDefinition instanceType, String name) { - super(pos, bb, value); - - this.geometries = geometries; - this.name = name; - this.instanceType = instanceType; - } - - /** - * @return the geometries - */ - public List> getGeometries() { - return geometries; - } - - @Override - public int hashCode() { - return super.hashCode(); - } - - @Override - public boolean equals(Object obj) { - return super.equals(obj); - } - - /** - * Get the instance name. - * - * @return the instance name or null if unknown - */ - public String getName() { - return name; - } - - /** - * @return the instance type definition - */ - public TypeDefinition getInstanceType() { - return instanceType; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/SourceInstancePainter.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/SourceInstancePainter.java deleted file mode 100644 index 7f8b4d42f0..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/SourceInstancePainter.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.painter; - -import org.eclipse.ui.PlatformUI; - -import eu.esdihumboldt.hale.common.instance.model.DataSet; -import eu.esdihumboldt.hale.ui.service.instance.InstanceService; - -/** - * Painter for source instances. - * - * @author Simon Templer - */ -public class SourceInstancePainter extends AbstractInstancePainter { - - /** - * Default constructor - */ - public SourceInstancePainter() { - super(PlatformUI.getWorkbench().getService(InstanceService.class), DataSet.SOURCE); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/StyledInstanceMarker.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/StyledInstanceMarker.java deleted file mode 100644 index 0bcc340bd4..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/StyledInstanceMarker.java +++ /dev/null @@ -1,643 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.painter; - -import java.awt.BasicStroke; -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.Shape; -import java.awt.geom.AffineTransform; -import java.awt.geom.PathIterator; -import java.awt.geom.Point2D; -import java.util.ArrayList; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.eclipse.ui.PlatformUI; -import org.geotools.geometry.jts.GeomCollectionIterator; -import org.geotools.geometry.jts.LiteShape2; -import org.geotools.renderer.lite.StyledShapePainter; -import org.geotools.renderer.style.GraphicStyle2D; -import org.geotools.renderer.style.MarkStyle2D; -import org.geotools.renderer.style.SLDStyleFactory; -import org.geotools.renderer.style.Style2D; -import org.geotools.styling.Fill; -import org.geotools.styling.LineSymbolizer; -import org.geotools.styling.Mark; -import org.geotools.styling.PointSymbolizer; -import org.geotools.styling.PolygonSymbolizer; -import org.geotools.styling.Rule; -import org.geotools.styling.SLD; -import org.geotools.styling.Stroke; -import org.geotools.styling.Style; -import org.geotools.styling.StyleBuilder; -import org.geotools.styling.Symbolizer; -import org.geotools.util.Range; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.PixelConverter; -import org.opengis.referencing.crs.CoordinateReferenceSystem; - -import org.locationtech.jts.geom.Coordinate; -import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.geom.GeometryCollection; -import org.locationtech.jts.geom.MultiPoint; -import org.locationtech.jts.geom.Point; - -import de.fhg.igd.geom.Point3D; -import de.fhg.igd.mapviewer.marker.BoundingBoxMarker; -import de.fhg.igd.mapviewer.marker.area.Area; -import de.fhg.igd.mapviewer.marker.area.BoxArea; -import de.fhg.igd.mapviewer.waypoints.SelectableWaypoint; -import eu.esdihumboldt.hale.common.instance.model.Instance; -import eu.esdihumboldt.hale.common.instance.model.InstanceReference; -import eu.esdihumboldt.hale.common.schema.geometry.CRSDefinition; -import eu.esdihumboldt.hale.common.schema.geometry.GeometryProperty; -import eu.esdihumboldt.hale.ui.common.service.style.StyleService; -import eu.esdihumboldt.hale.ui.service.instance.InstanceService; -import eu.esdihumboldt.hale.ui.style.StyleHelper; -import eu.esdihumboldt.hale.ui.style.service.internal.StylePreferences; -import eu.esdihumboldt.hale.ui.views.styledmap.util.CRSConverter; - -/** - * Instance marker support styles provided through the {@link StyleService}. - * - * @author Simon Templer - */ -@SuppressWarnings("restriction") -public class StyledInstanceMarker extends InstanceMarker { - - private final AtomicBoolean styleInitialized = new AtomicBoolean(false); - private volatile Color styleFillColor; - private volatile Color styleStrokeColor; - private volatile java.awt.Stroke styleStroke; - private boolean hasFill = true; - private PointSymbolizer pointSymbolizer; - private static final StyleBuilder styleBuilder = new StyleBuilder(); - - /** - * The way-point the marker is associated with - */ - private final InstanceWaypoint wp; - - /** - * Create a instance marker supporting styles. - * - * @param wp the way-point the marker is associated with - */ - public StyledInstanceMarker(InstanceWaypoint wp) { - this.wp = wp; - } - - /** - * Initialize the style information. - * - * @param context the context - */ - private synchronized void initStyle(InstanceWaypoint context) { - if (!styleInitialized.compareAndSet(false, true)) { - // already initialized - return; - } - - // check if there is a Rule from the Rulestyle-Page and apply to the - // instancemarker on the map - // performs a special task if the found symbolizer is a point symbolizer - Rule honoredRule = honorRules(context); - pointSymbolizer = null; - if (honoredRule != null) { - for (Symbolizer sym : honoredRule.symbolizers()) { - if (sym instanceof PointSymbolizer) { - pointSymbolizer = (PointSymbolizer) sym; - break; - } - } - } - - fillStyle(honoredRule, context); - strokeStyle(honoredRule, context); - } - - /** - * Checks if there is a rule for the certain Instance - * - * @param context the context - * @return a certain style rule for the instance, else-rule if nothing found - * or null if there is no else-rule - */ - private Rule honorRules(InstanceWaypoint context) { - Style style = getStyle(context); - Rule[] rules = SLD.rules(style); - - // do rules exist? - - if (rules == null || rules.length == 0) { - return null; - } - - // sort the elserules at the end - if (rules.length > 1) { - rules = sortRules(rules); - } - - // if rule exists - InstanceReference ir = context.getValue(); - InstanceService is = PlatformUI.getWorkbench().getService(InstanceService.class); - boolean instanceInitialized = false; - Instance inst = null; // instance variable - only initialize if needed - - for (int i = 0; i < rules.length; i++) { - - if (rules[i].getFilter() != null) { - if (!instanceInitialized) { - // initialize instance (as it is needed for the filter) - inst = is.getInstance(ir); - instanceInitialized = true; - } - if (rules[i].getFilter().evaluate(inst)) { - return rules[i]; - } - } - - // if a rule exist without a filter and without being an - // else-filter, - // the found rule applies to all types - else { - if (!rules[i].isElseFilter()) { - return rules[i]; - } - } - } - - // if there is no appropriate rule, check if there is an else-rule - for (int i = 0; i < rules.length; i++) { - if (rules[i].isElseFilter()) { - return rules[i]; - } - } - - // return null if no rule was found - return null; - } - - /** - * Sorts an array of rules, so the else-filter-rules are at the end - * - * @param rules an array of Rules - * @return a new array of Rules with sorted elements - */ - private Rule[] sortRules(Rule[] rules) { - - ArrayList temp = new ArrayList(); - - for (int i = 0; i < rules.length; i++) { - - if (!rules[i].isElseFilter()) { - temp.add(rules[i]); - } - } - - for (int i = 0; i < rules.length; i++) { - - if (rules[i].isElseFilter()) { - temp.add(rules[i]); - } - - } - - Rule[] newRules = new Rule[temp.size()]; - return temp.toArray(newRules); - } - - /** - * Retrieves the fill for the map marker. - * - * @param rule a certain rule to apply, may be null - * @param context the InstanceWayPoint, which gets marked - */ - private synchronized void fillStyle(Rule rule, InstanceWaypoint context) { - // retrieve fill - Fill fill = null; - - // try the Symbolizers from the Rule - for (int i = 0; rule != null && fill == null && i < rule.getSymbolizers().length; i++) { - if (rule.getSymbolizers()[i] instanceof PolygonSymbolizer) { - fill = SLD.fill((PolygonSymbolizer) rule.getSymbolizers()[i]); - } - else if (rule.getSymbolizers()[i] instanceof PointSymbolizer) { - fill = SLD.fill((PointSymbolizer) rule.getSymbolizers()[i]); - } - } - - // if we have a fill now - if (fill != null) { - Color sldColor = SLD.color(fill); - double opacity = SLD.opacity(fill); - if (sldColor != null) { - styleFillColor = new Color(sldColor.getRed(), sldColor.getGreen(), - sldColor.getBlue(), (int) (opacity * 255)); - } - else { - styleFillColor = super.getPaintColor(context); - } - hasFill = true; - } - // if we still don't have a fill - else { - styleFillColor = null; - hasFill = false; - } - } - - /** - * retrieves the stroke for the map marker - * - * @param rule a certain rule to apply, maybe null - * @param context the InstanceWayPoint, wich gets marked - */ - private synchronized void strokeStyle(Rule rule, InstanceWaypoint context) { - - // retrieve stroke - Stroke stroke = null; - - // try the Symbolizers from the Rule - - for (int i = 0; rule != null && stroke == null && i < rule.getSymbolizers().length; i++) { - if (rule.getSymbolizers()[i] instanceof LineSymbolizer) { - stroke = SLD.stroke((LineSymbolizer) rule.getSymbolizers()[i]); - } - else if (rule.getSymbolizers()[i] instanceof PolygonSymbolizer) { - stroke = SLD.stroke((PolygonSymbolizer) rule.getSymbolizers()[i]); - } - else if (rule.getSymbolizers()[i] instanceof PointSymbolizer) { - stroke = SLD.stroke((PointSymbolizer) rule.getSymbolizers()[i]); - } - } - - // if we have a stroke now - if (stroke != null) { - // XXX is there any Geotools stroke to AWT stroke lib/code - // somewhere?! - // XXX have a look at the renderer code (StreamingRenderer) - - // stroke color - Color sldColor = SLD.color(stroke); - double opacity = SLD.opacity(stroke); - if (Double.isNaN(opacity)) { - // fall back to default opacity - opacity = StyleHelper.DEFAULT_FILL_OPACITY; - } - if (sldColor != null) { - styleStrokeColor = new Color(sldColor.getRed(), sldColor.getGreen(), - sldColor.getBlue(), (int) (opacity * 255)); - } - else { - styleStrokeColor = super.getBorderColor(context); - } - - // stroke width - int strokeWidth = SLD.width(stroke); - if (strokeWidth == SLD.NOTFOUND) { - // fall back to default width - strokeWidth = StylePreferences.getDefaultWidth(); - } - styleStroke = new BasicStroke(strokeWidth); - } - else { - styleStroke = null; - styleStrokeColor = null; - } - } - - /** - * Reset the marker style - */ - public void resetStyle() { - styleInitialized.set(false); - areaReset(); - } - - /** - * @see InstanceMarker#getPaintColor(InstanceWaypoint) - */ - @Override - protected Color getPaintColor(InstanceWaypoint context) { - initStyle(context); - - if (styleFillColor == null || context.isSelected()) { - // for selection don't use style - return super.getPaintColor(context); - } - - return styleFillColor; - } - - /** - * @see InstanceMarker#getBorderColor(InstanceWaypoint) - */ - @Override - protected Color getBorderColor(InstanceWaypoint context) { - initStyle(context); - - if (styleStrokeColor == null || context.isSelected()) { - return super.getBorderColor(context); - } - - return styleStrokeColor; - } - - /** - * Get the stroke for drawing lines. - * - * @param context the context - * @return the stroke - */ - @Override - protected java.awt.Stroke getLineStroke(InstanceWaypoint context) { - initStyle(context); - - if (styleStroke != null && !context.isSelected()) { - return styleStroke; - } - else { - return super.getLineStroke(context); - } - } - - /** - * @see BoundingBoxMarker#applyFill(Graphics2D, SelectableWaypoint) - */ - @Override - protected boolean applyFill(Graphics2D g, InstanceWaypoint context) { - initStyle(context); - - if (hasFill) { - g.setPaint(getPaintColor(context)); - return true; - } - - return false; - } - - /** - * @see BoundingBoxMarker#applyStroke(Graphics2D, SelectableWaypoint) - */ - @Override - protected boolean applyStroke(Graphics2D g, InstanceWaypoint context) { - initStyle(context); - - return super.applyStroke(g, context); - } - - /** - * Get the style for a given way-point. - * - * @param context the way-point - * @return the style - */ - private Style getStyle(InstanceWaypoint context) { - StyleService ss = PlatformUI.getWorkbench().getService(StyleService.class); - InstanceReference ref = context.getValue(); - return ss.getStyle(context.getInstanceType(), ref.getDataSet()); - } - - /** - * @see BoundingBoxMarker#isToSmall(int, int, int) - */ - @Override - protected boolean isToSmall(int width, int height, int zoom) { - if (representsSinglePoint()) { - // disable fallback marker, as paintPoint would never be called - return false; - } - return super.isToSmall(width, height, zoom); - } - - /** - * Determines if the associated way-point represents a single point. - * - * @return if the way-point represents a single point - */ - private boolean representsSinglePoint() { - boolean pointFound = false; - for (GeometryProperty geom : wp.getGeometries()) { - if (geom.getGeometry() != null && geom.getCRSDefinition() != null) { - // valid geometry - if (pointFound) { - // a point was already found before - return false; - } - - if (geom.getGeometry() instanceof Point || (geom.getGeometry() instanceof MultiPoint - && geom.getGeometry().getNumGeometries() == 1)) { - // a single point found - pointFound = true; - } - else { - // another geometry found - return false; - } - } - } - return pointFound; - } - - /** - * @see InstanceMarker#paintPoint(Point, Graphics2D, CRSDefinition, - * InstanceWaypoint, PixelConverter, int, CoordinateReferenceSystem, - * boolean) - */ - @Override - protected Area paintPoint(Point geometry, Graphics2D g, CRSDefinition crsDefinition, - InstanceWaypoint context, PixelConverter converter, int zoom, - CoordinateReferenceSystem mapCRS, boolean calculateArea) { - initStyle(context); - Area area = null; - try { - if (pointSymbolizer == null || (SLD.mark(pointSymbolizer) == null - && pointSymbolizer.getGraphic().graphicalSymbols().isEmpty())) { - // only marks supported for now - // if there is no specialized PointSymbolizer, fall back to a - // generic - return super.paintFallback(g, context, converter, zoom, null, calculateArea); - } - - // get CRS converter - CRSConverter conv = CRSConverter.getConverter(crsDefinition.getCRS(), mapCRS); - - // manually convert to map CRS - Point3D mapPoint = conv.convert(geometry.getX(), geometry.getY(), 0); - - GeoPosition pos = new GeoPosition(mapPoint.getX(), mapPoint.getY(), - converter.getMapEpsg()); - - // determine pixel coordinates - Point2D point = converter.geoToPixel(pos, zoom); - Coordinate coordinate = new Coordinate(point.getX(), point.getY()); - Point newPoint = geometry.getFactory().createPoint(coordinate); - - // create a LiteShape and instantiate the Painter and the - // StyleFactory - LiteShape2 lites = new LiteShape2(newPoint, null, null, false); - StyledShapePainter ssp = new StyledShapePainter(); - SLDStyleFactory styleFactory = new SLDStyleFactory(); - - Range range = new Range(Double.class, 0.5, 1.5); - - PointSymbolizer pointS; - // is the Waypoint selected? - if (context.isSelected()) { - // switch to the SelectionSymbolizer - pointS = getSelectionSymbolizer(pointSymbolizer); - } - // use the specific PointSymbolizer - else - pointS = pointSymbolizer; - - // Create the Style2D object for painting with the use of a - // DummyFeature wich extends SimpleFeatures - // because Geotools can only work with that - DummyFeature dummy = new DummyFeature(); - Style2D style2d = styleFactory.createStyle(dummy, pointS, range); - // create the area object of the painted image for further use - area = getArea(point, style2d, lites); - // actually paint - ssp.paint(g, lites, style2d, 1); - - // used to draw selection if a graphic style is used (external - // graphic) - if (context.isSelected() && style2d instanceof GraphicStyle2D) { - GraphicStyle2D gs2d = (GraphicStyle2D) style2d; - - // get minX and minY for the drawn rectangle arround the image - int minX = (int) point.getX() - gs2d.getImage().getWidth() / 2; - int minY = (int) point.getY() - gs2d.getImage().getHeight() / 2; - - // apply the specification of the selection rectangle - applyFill(g, context); - applyStroke(g, context); - // draw the selection rectangle - g.drawRect(minX - 1, minY - 1, gs2d.getImage().getWidth() + 1, - gs2d.getImage().getHeight() + 1); - - } - } catch (Exception e) { - e.printStackTrace(); - return null; - } - return area; - - } - - /** - * Creates a certain Point Symbolizer if the waypoint is selected - * - * @param symbolizer a symbolizer which is used to create the selection - * symbolizer - * @return returns the selection symbolizer - */ - private PointSymbolizer getSelectionSymbolizer(PointSymbolizer symbolizer) { - // XXX only works with marks and external graphics right now - Mark mark = SLD.mark(symbolizer); - if (mark != null) { - Mark mutiMark = styleBuilder.createMark(mark.getWellKnownName(), - styleBuilder.createFill(StylePreferences.getSelectionColor(), - StyleHelper.DEFAULT_FILL_OPACITY), - styleBuilder.createStroke(StylePreferences.getSelectionColor(), - StylePreferences.getSelectionWidth())); - - // create new symbolizer - return styleBuilder - .createPointSymbolizer(styleBuilder.createGraphic(null, mutiMark, null)); - } - - else { - return symbolizer; - - } - } - - /** - * Returns the area of the drawn point. - * - * @param point the point - * @param style the Style2D object - * @param shape the Light Shape - * @return the area, which should equal the space of the drawn object - */ - private Area getArea(Point2D point, Style2D style, LiteShape2 shape) { - // if it is a mark style - if (style instanceof MarkStyle2D) { - PathIterator citer = getPathIterator(shape); - - float[] coords = new float[2]; - MarkStyle2D ms2d = (MarkStyle2D) style; - - Shape transformedShape; - while (!(citer.isDone())) { - citer.currentSegment(coords); - transformedShape = ms2d.getTransformedShape(coords[0], coords[1]); - if (transformedShape != null) { - java.awt.geom.Area areatemp = new java.awt.geom.Area(transformedShape); - Rectangle rec = areatemp.getBounds(); - AdvancedBoxArea area = new AdvancedBoxArea(areatemp, rec.x, rec.y, - rec.x + rec.width, rec.y + rec.height); - - return area; - } - } - } - // if it is an external graphic style - else if (style instanceof GraphicStyle2D) { - GraphicStyle2D gs2d = (GraphicStyle2D) style; - - int minX = (int) point.getX() - gs2d.getImage().getWidth() / 2; - int minY = (int) point.getY() - gs2d.getImage().getHeight() / 2; - int maxX = (int) point.getX() + gs2d.getImage().getWidth() / 2; - int maxY = (int) point.getX() + gs2d.getImage().getHeight() / 2; - - BoxArea area = new BoxArea(minX, minY, maxX, maxY); - return area; - } - - return null; - } - - /** - * Returns a path iterator. - * - * @param shape a shape to determine the iterator - * @return the path iterator - */ - private PathIterator getPathIterator(final LiteShape2 shape) { - // DJB: changed this to handle multi* geometries and line and - // polygon geometries better - GeometryCollection gc; - if (shape.getGeometry() instanceof GeometryCollection) - gc = (GeometryCollection) shape.getGeometry(); - else { - Geometry[] gs = new Geometry[1]; - gs[0] = shape.getGeometry(); - // make a Point,Line, or Poly into a GC - gc = shape.getGeometry().getFactory().createGeometryCollection(gs); - } - AffineTransform IDENTITY_TRANSFORM = new AffineTransform(); - GeomCollectionIterator citer = new GeomCollectionIterator(gc, IDENTITY_TRANSFORM, false, - 1.0); - return citer; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/TransformedInstancePainter.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/TransformedInstancePainter.java deleted file mode 100644 index d11d95b810..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/painter/TransformedInstancePainter.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.painter; - -import org.eclipse.ui.PlatformUI; - -import eu.esdihumboldt.hale.common.instance.model.DataSet; -import eu.esdihumboldt.hale.ui.service.instance.InstanceService; - -/** - * Painter for transformed instances. - * - * @author Simon Templer - */ -public class TransformedInstancePainter extends AbstractInstancePainter { - - /** - * Default constructor - */ - public TransformedInstancePainter() { - super(PlatformUI.getWorkbench().getService(InstanceService.class), DataSet.TRANSFORMED); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/preferences/StyledMapPreferenceConstants.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/preferences/StyledMapPreferenceConstants.java deleted file mode 100644 index 8f61c49623..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/preferences/StyledMapPreferenceConstants.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.preferences; - -/** - * Preference constants for the styled map view. - * - * @author Simon Templer - */ -public interface StyledMapPreferenceConstants { - - /** - * The current map layout. - */ - public static final String CURRENT_MAP_LAYOUT = "styledmap.current.layout"; //$NON-NLS-1$ - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/preferences/StyledMapPreferenceInitializer.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/preferences/StyledMapPreferenceInitializer.java deleted file mode 100644 index 7922412041..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/preferences/StyledMapPreferenceInitializer.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.preferences; - -import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; -import org.eclipse.jface.preference.IPreferenceStore; - -import eu.esdihumboldt.hale.ui.views.styledmap.internal.StyledMapBundle; - -/** - * Preference initializer for the styled map view. - * - * @author Simon Templer - */ -public class StyledMapPreferenceInitializer extends AbstractPreferenceInitializer implements - StyledMapPreferenceConstants { - - private static final String DEFAULT_MAP_LAYOUT = "eu.esdihumboldt.hale.ui.views.styledmap.default"; - - /** - * @see AbstractPreferenceInitializer#initializeDefaultPreferences() - */ - @Override - public void initializeDefaultPreferences() { - IPreferenceStore store = StyledMapBundle.getDefault().getPreferenceStore(); - - store.setDefault(CURRENT_MAP_LAYOUT, DEFAULT_MAP_LAYOUT); - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/tool/AbstractInstanceTool.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/tool/AbstractInstanceTool.java deleted file mode 100644 index 840f52ce1e..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/tool/AbstractInstanceTool.java +++ /dev/null @@ -1,256 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.tool; - -import java.awt.Point; -import java.awt.Polygon; -import java.awt.Rectangle; -import java.awt.event.MouseEvent; -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.ISelectionListener; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.PlatformUI; -import org.jdesktop.swingx.mapviewer.GeoPosition; - -import de.fhg.igd.mapviewer.tools.AbstractMapTool; -import eu.esdihumboldt.hale.ui.selection.InstanceSelection; -import eu.esdihumboldt.hale.ui.selection.impl.DefaultInstanceSelection; -import eu.esdihumboldt.hale.ui.views.styledmap.painter.AbstractInstancePainter; - -/** - * Instance selection tool. - * - * @author Simon Templer - */ -public abstract class AbstractInstanceTool extends AbstractMapTool implements ISelectionProvider, - ISelectionListener { - - private final Set listeners = new HashSet(); - - private ISelection lastSelection = null; - - /** - * Default constructor - */ - public AbstractInstanceTool() { - super(); - - initSelection(); - } - - private void initSelection() { - // initialize the selection with the existing selection - if (Display.getCurrent() == null) { - final Display display = PlatformUI.getWorkbench().getDisplay(); - display.syncExec(new Runnable() { - - @Override - public void run() { - lastSelection = PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getSelectionService().getSelection(); - } - }); - } - else { - lastSelection = PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getSelectionService().getSelection(); - } - } - - /** - * @see AbstractMapTool#activate() - */ - @Override - public void activate() { - super.activate(); - - initSelection(); - } - - /** - * @see AbstractMapTool#click(MouseEvent, GeoPosition) - */ - @Override - public void click(MouseEvent me, GeoPosition pos) { - // override me - } - - /** - * @see AbstractMapTool#popup(MouseEvent, GeoPosition) - */ - @Override - public void popup(MouseEvent me, GeoPosition pos) { - // override me - } - - /** - * @see AbstractMapTool#released(MouseEvent, GeoPosition) - */ - @Override - public void released(MouseEvent me, GeoPosition pos) { - // override me - } - - /** - * @see AbstractMapTool#pressed(MouseEvent, GeoPosition) - */ - @Override - public void pressed(MouseEvent me, GeoPosition pos) { - // override me - } - - /** - * Fire a selection change - * - * @param selection the new selection - */ - protected void fireSelectionChange(ISelection selection) { - for (ISelectionChangedListener listener : listeners) { - listener.selectionChanged(new SelectionChangedEvent(this, selection)); - } - } - - /** - * @see ISelectionProvider#addSelectionChangedListener(ISelectionChangedListener) - */ - @Override - public void addSelectionChangedListener(ISelectionChangedListener listener) { - listeners.add(listener); - } - - /** - * @see ISelectionProvider#getSelection() - */ - @Override - public ISelection getSelection() { - return lastSelection; - } - - /** - * @see ISelectionProvider#removeSelectionChangedListener(ISelectionChangedListener) - */ - @Override - public void removeSelectionChangedListener(ISelectionChangedListener listener) { - listeners.remove(listener); - } - - /** - * @see ISelectionProvider#setSelection(ISelection) - */ - @Override - public void setSelection(ISelection selection) { - lastSelection = selection; - fireSelectionChange(selection); - } - - /** - * @see ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, - * org.eclipse.jface.viewers.ISelection) - */ - @Override - public void selectionChanged(IWorkbenchPart part, ISelection selection) { - if (selection != lastSelection) { - if (selection instanceof InstanceSelection) { - // only allow override by instance selections - lastSelection = selection; - } - } - } - - /** - * Update the selection for the given selection area. - * - * @param selectionArea the selection area (as supported by - * {@link #getSelection(AbstractInstancePainter, Object)}) - * @param combineWithLast if the selection shall be combined with the last - * selection - * @param allowPainterCombine if selections from different painters may be - * combined - */ - protected void updateSelection(Object selectionArea, boolean combineWithLast, - boolean allowPainterCombine) { - ISelection newSelection = null; - - // determine new selection - for (AbstractInstancePainter painter : mapKit - .getTilePainters(AbstractInstancePainter.class)) { - ISelection selection = getSelection(painter, selectionArea); - if (allowPainterCombine) { - newSelection = AbstractInstancePainter.combineSelection(newSelection, selection); - } - else { - newSelection = AbstractInstancePainter.preferSelection(newSelection, selection); - } - } - - // combine with old - if (combineWithLast) { - newSelection = AbstractInstancePainter.combineSelection(lastSelection, newSelection); - } - - if (newSelection == null) { - newSelection = new DefaultInstanceSelection(); - } - - // selection update - lastSelection = newSelection; - fireSelectionChange(newSelection); - } - - /** - * Get the selection for the given painter in the given selection area. - * - * @param painter the instance painter - * @param selectionArea the selection area (supported are {@link Rectangle}, - * {@link Point}, {@link Polygon} or a {@link Polygon} array) - * - * @return the selection or null - */ - protected ISelection getSelection(AbstractInstancePainter painter, Object selectionArea) { - if (selectionArea instanceof Polygon[]) { - Polygon[] polys = (Polygon[]) selectionArea; - - ISelection selection = null; - for (Polygon poly : polys) { - ISelection polySelection = painter.getSelection(poly); - selection = AbstractInstancePainter.combineSelection(selection, polySelection); - } - - return selection; - } - else if (selectionArea instanceof Polygon) { - return painter.getSelection((Polygon) selectionArea); - } - else if (selectionArea instanceof Rectangle) { - return painter.getSelection((Rectangle) selectionArea); - } - else if (selectionArea instanceof Point) { - return painter.getSelection((Point) selectionArea); - } - else { - return null; - } - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/tool/InstanceTool.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/tool/InstanceTool.java deleted file mode 100644 index 5edfc8181b..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/tool/InstanceTool.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.tool; - -import java.awt.Color; -import java.awt.Rectangle; -import java.awt.event.MouseEvent; -import java.awt.geom.Point2D; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; - -import de.fhg.igd.mapviewer.MapTool; -import de.fhg.igd.mapviewer.tools.AbstractMapTool; -import de.fhg.igd.mapviewer.tools.renderer.BoxRenderer; - -/** - * Tool for selecting instances, either by a click or through a selection box. - * - * @author Simon Templer - */ -public class InstanceTool extends AbstractInstanceTool { - - private static final Log log = LogFactory.getLog(InstanceTool.class); - - /** - * Default constructor - */ - public InstanceTool() { - BoxRenderer renderer = new BoxRenderer(); - - renderer.setBackColor(new Color(0, 255, 255, 50)); - renderer.setBorderColor(new Color(0, 255, 255, 255)); - - setRenderer(renderer); - } - - /** - * @see AbstractMapTool#click(MouseEvent, GeoPosition) - */ - @Override - public void click(MouseEvent me, GeoPosition pos) { - if (me.getClickCount() == 2) { - mapKit.setCenterPosition(pos); - mapKit.setZoom(mapKit.getMainMap().getZoom() - 1); - } - else if (me.getClickCount() == 1) { - if (me.isAltDown() && getPositions().size() < 1) { - // add pos - addPosition(pos); - } - else if (getPositions().size() == 1) { - // finish box selection - // action & reset - addPosition(pos); - - // action - try { - List points = getPoints(); - Rectangle rect = new Rectangle((int) points.get(0).getX(), (int) points.get(0) - .getY(), 0, 0); - rect.add(points.get(1)); - - updateSelection(rect, me.isControlDown() || me.isMetaDown(), true); - } catch (IllegalGeoPositionException e) { - log.error("Error calculating selection box", e); //$NON-NLS-1$ - } - - reset(); - } - else { - // click selection - reset(); - - updateSelection(me.getPoint(), me.isControlDown() || me.isMetaDown(), true); - } - } - } - - /** - * @see AbstractMapTool#popup(MouseEvent, GeoPosition) - */ - @Override - public void popup(MouseEvent me, GeoPosition pos) { - reset(); - } - - /** - * @see MapTool#isPanEnabled() - */ - @Override - public boolean isPanEnabled() { - return true; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/util/CRSConverter.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/util/CRSConverter.java deleted file mode 100644 index b4707aeec0..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/util/CRSConverter.java +++ /dev/null @@ -1,227 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.util; - -import java.util.HashMap; -import java.util.Map; - -import org.geotools.geometry.DirectPosition2D; -import org.geotools.referencing.CRS; -import org.opengis.geometry.DirectPosition; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.cs.AxisDirection; -import org.opengis.referencing.operation.MathTransform; -import org.opengis.referencing.operation.TransformException; - -import de.fhg.igd.geom.BoundingBox; -import de.fhg.igd.geom.Point3D; - -/** - * Geotools based CRS converter. - * - * @author Simon Templer - */ -public class CRSConverter { - - /** - * Thread local direct position initialized with a {@link DirectPosition2D}. - */ - public static class ThreadLocalDirectPosition2D extends ThreadLocal { - - @Override - protected DirectPosition initialValue() { - return new DirectPosition2D(); - } - - } - - /** - * Create a CRS converter between the given coordinate reference systems. - * - * @param source the source CRS - * @param target the target CRS - * @return the CRS converter - * @throws FactoryException if creating the transformer fails - */ - public synchronized static CRSConverter getConverter(CoordinateReferenceSystem source, - CoordinateReferenceSystem target) throws FactoryException { - CRSConverter converter = null; - - // try retrieving converter from map - Map sourceConverters = converters.get(source); - if (sourceConverters != null) { - converter = sourceConverters.get(target); - } - - if (converter == null) { - // create and store the converter - converter = new CRSConverter(source, target); - - if (sourceConverters == null) { - sourceConverters = new HashMap(); - converters.put(source, sourceConverters); - } - - sourceConverters.put(target, converter); - } - - return converter; - } - - /** - * Source CRS mapped to target CRS mapped to converter - */ - private static final Map> converters = new HashMap>(); - - private final CoordinateReferenceSystem source; - - private final CoordinateReferenceSystem target; - - private final boolean initialFlip; - - private final boolean finalFlip; - - private final MathTransform math; - - /* - * temporary positions to lower the impact on GC - */ - private final ThreadLocal _tempPos2A = new ThreadLocalDirectPosition2D(); - private final ThreadLocal _tempPos2B = new ThreadLocalDirectPosition2D(); - - /** - * Create a CRS converter between the given coordinate reference systems. - * - * @param source the source CRS - * @param target the target CRS - * @throws FactoryException if creating the transformer fails - */ - private CRSConverter(CoordinateReferenceSystem source, CoordinateReferenceSystem target) - throws FactoryException { - this.source = source; - this.target = target; - -// this.math = CRS.findMathTransform(source, target); - // XXX lenient mode to find transformation also if Bursa Wolf parameters - // are not present (ok for display according to Geotools) - // http://docs.geotools.org/latest/userguide/faq.html#q-bursa-wolf-parameters-required - // XXX does this error only occur for CRS related to shapefiles? - this.math = CRS.findMathTransform(source, target, true); - - /* - * XXX do not flip the coordinates - the math transformation should - * handle it correctly, because it is based on the CRS definitions - */ - this.initialFlip = false; // flipCRS(source); - this.finalFlip = false; // flipCRS(target); - } - - /** - * Convert a bounding box. - * - * @param bb the bounding box in the source CRS - * @return the bounding box in the target CRS - * @throws TransformException if the conversion fails - */ - public BoundingBox convert(BoundingBox bb) throws TransformException { - Point3D targetCorners[] = { null, null }; - targetCorners[0] = convert(bb.getMinX(), bb.getMinY(), bb.getMinZ()); - targetCorners[1] = convert(bb.getMaxX(), bb.getMaxY(), bb.getMaxZ()); - return new BoundingBox(// - targetCorners[0].getX(), // - targetCorners[0].getY(), // - targetCorners[0].getZ(), // - targetCorners[1].getX(), // - targetCorners[1].getY(), // - targetCorners[1].getZ()); - } - - /** - * This method checks if the the CoordinateSystem is in the way we expected, - * or if we have to flip the coordinates. - * - * @param crs The CRS to be checked. - * @return True, if we have to flip the coordinates - */ - @SuppressWarnings("unused") - private boolean flipCRS(CoordinateReferenceSystem crs) { - if (crs.getCoordinateSystem().getDimension() == 2) { - AxisDirection direction = crs.getCoordinateSystem().getAxis(0).getDirection(); - if (direction.equals(AxisDirection.NORTH) || direction.equals(AxisDirection.UP)) { - return true; - } - } - return false; - } - - /** - * This method converts the given coordinates and returns them as a Point3D. - * - * @param x the x ordinate - * @param y the y ordinate - * @param z the z ordinate - * @return The converted coordinates as a Point3D. - * @throws TransformException if the coordinate transformation fails - */ - public Point3D convert(double x, double y, double z) throws TransformException { - DirectPosition position = _tempPos2A.get(); - if (this.initialFlip) { - position.setOrdinate(0, y); - position.setOrdinate(1, x); - } - else { - position.setOrdinate(0, x); - position.setOrdinate(1, y); - } - - DirectPosition targetPosition = _tempPos2B.get(); - math.transform(position, targetPosition); - - return createPoint3D(targetPosition.getOrdinate(0), targetPosition.getOrdinate(1), z); - } - - /** - * This method creates a Point3D from the given coordinates. - * - * @param x The X axis value of the coordinate. - * @param y The Y axis value of the coordinate. - * @param z The Z axis value of the coordinate. - * @return A Point3D from the given coordinates. - */ - private Point3D createPoint3D(double x, double y, double z) { - if (finalFlip) { - return new Point3D(y, x, z); - } - return new Point3D(x, y, z); - } - - /** - * @return the source coordinate reference system - */ - public CoordinateReferenceSystem getSource() { - return source; - } - - /** - * @return the target coordinate reference system - */ - public CoordinateReferenceSystem getTarget() { - return target; - } - -} diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/util/CRSDecode.java b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/util/CRSDecode.java deleted file mode 100644 index d603317975..0000000000 --- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/src/eu/esdihumboldt/hale/ui/views/styledmap/util/CRSDecode.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2012 Data Harmonisation Panel - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the License, - * or (at your option) any later version. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this distribution. If not, see . - * - * Contributors: - * HUMBOLDT EU Integrated Project #030962 - * Data Harmonisation Panel - */ - -package eu.esdihumboldt.hale.ui.views.styledmap.util; - -import java.util.HashMap; -import java.util.Map; - -import org.geotools.referencing.CRS; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.NoSuchAuthorityCodeException; -import org.opengis.referencing.crs.CoordinateReferenceSystem; - -/** - * Utility class for CRS decoding. - * - * @author Simon Templer - */ -public abstract class CRSDecode { - - /** - * Code mapped to CRS - */ - private static final Map crsMap = new HashMap(); - - /** - * Get or create the CRS with the given code. - * - * @param code the CRS code - * @return the coordinate reference system - * @throws NoSuchAuthorityCodeException if a code with an unknown authority - * was supplied - * @throws FactoryException if creation of the CRS failed - */ - public synchronized static CoordinateReferenceSystem getCRS(String code) - throws NoSuchAuthorityCodeException, FactoryException { - CoordinateReferenceSystem crs = crsMap.get(code); - - if (crs == null) { - crs = CRS.decode(code); - } - - return crs; - } - - /** - * Get or create the CRS with the given code. - * - * @param epsg the EPSG code of the CRS - * @return the coordinate reference system - * @throws NoSuchAuthorityCodeException if EPSG is not known to the system - * @throws FactoryException if creation of the CRS failed - */ - public static CoordinateReferenceSystem getCRS(int epsg) throws NoSuchAuthorityCodeException, - FactoryException { - return getCRS("EPSG:" + epsg); - } - - /** - * Code mapped to CRS - */ - private static final Map crsMapLonLat = new HashMap(); - - /** - * Get or create the CRS with the given code. - * - * @param code the CRS code - * @return the coordinate reference system - * @throws NoSuchAuthorityCodeException if a code with an unknown authority - * was supplied - * @throws FactoryException if creation of the CRS failed - */ - public synchronized static CoordinateReferenceSystem getLonLatCRS(String code) - throws NoSuchAuthorityCodeException, FactoryException { - CoordinateReferenceSystem crs = crsMapLonLat.get(code); - - if (crs == null) { - crs = CRS.decode(code, true); - } - - return crs; - } - - /** - * Get or create the CRS with the given code. - * - * @param epsg the EPSG code of the CRS - * @return the coordinate reference system - * @throws NoSuchAuthorityCodeException if EPSG is not known to the system - * @throws FactoryException if creation of the CRS failed - */ - public static CoordinateReferenceSystem getLonLatCRS(int epsg) - throws NoSuchAuthorityCodeException, FactoryException { - return getLonLatCRS("EPSG:" + epsg); - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/.classpath b/ext/styledmap/org.jdesktop.swingx.mapviewer/.classpath deleted file mode 100644 index d8b09e003d..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/.project b/ext/styledmap/org.jdesktop.swingx.mapviewer/.project deleted file mode 100644 index 6e38b7a980..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - org.jdesktop.swingx.mapviewer - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/edu.umd.cs.findbugs.core.prefs b/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 58ce6d564e..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.core.resources.prefs b/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index ff635dadef..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.jdt.core.prefs b/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f27049f484..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.jdt.groovy.core.prefs b/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.jdt.launching.prefs b/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 706de46d84..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.jdt.ui.prefs b/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index b90cfe5125..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,68 +0,0 @@ -#Updated from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.ignorelowercasenames=true -org.eclipse.jdt.ui.importorder=java;javax;org;com;de; -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.ondemandthreshold=99 -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.staticondemandthreshold=99 -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.pde.core.prefs b/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 5fca39f9f1..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.pde.prefs b/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/META-INF/MANIFEST.MF b/ext/styledmap/org.jdesktop.swingx.mapviewer/META-INF/MANIFEST.MF deleted file mode 100644 index b5307287a9..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/META-INF/MANIFEST.MF +++ /dev/null @@ -1,40 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: TileMapKit -Bundle-SymbolicName: org.jdesktop.swingx.mapviewer;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-ClassPath: . -Export-Package: org.jdesktop.swingx.mapviewer;version="1.0.0"; - uses:="org.jdesktop.swingx, - org.jdesktop.swingx.painter, - org.jdesktop.beans, - javax.swing", - org.jdesktop.swingx.mapviewer.bmng;version="1.0.0";uses:="org.jdesktop.swingx.mapviewer", - org.jdesktop.swingx.mapviewer.empty;version="1.0.0";uses:="org.jdesktop.swingx.mapviewer", - org.jdesktop.swingx.mapviewer.esri;version="1.0.0";uses:="org.jdesktop.swingx.mapviewer", - org.jdesktop.swingx.mapviewer.util;version="1.0.0";uses:="org.jdesktop.swingx.mapviewer", - org.jdesktop.swingx.mapviewer.wms;version="1.0.0";uses:="org.jdesktop.swingx.mapviewer" -Require-Bundle: org.jdesktop.swingx;bundle-version="1.0.0" -Import-Package: com.google.common.cache;version="27.0.0", - com.google.common.collect;version="9.0.0", - edu.umd.cs.findbugs.annotations, - eu.esdihumboldt.hale.common.core, - eu.esdihumboldt.util.http, - eu.esdihumboldt.util.http.client, - org.apache.commons.logging;version="1.1.1", - org.apache.http, - org.apache.http.client, - org.apache.http.client.methods, - org.apache.http.impl.client, - org.geotools.geometry;version="29.1.0.combined", - org.geotools.referencing;version="29.1.0.combined", - org.opengis.geometry, - org.opengis.referencing, - org.opengis.referencing.crs, - org.opengis.referencing.cs, - org.opengis.referencing.operation, - org.opengis.util, - org.osgi.framework;version="1.9.0" -Bundle-ActivationPolicy: lazy -Automatic-Module-Name: org.jdesktop.swingx.mapviewer diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/basic-build.properties b/ext/styledmap/org.jdesktop.swingx.mapviewer/basic-build.properties deleted file mode 100644 index daa8e11a18..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/basic-build.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Application/Project name (should not contain any whitespaces or special characters) -name=TileMapKit - -# Project main class -#mainclass= - -# Locations of other projects -dependencies=../Utilities - -# Build variables -export.libs=false - -# Resource files to include in build -resources=**/*.xml,**/*.properties,**/*.gif,**/*.png,**/*.jpg - -# Exclude from library -#jar.excludes=connection.properties,log4j.xml - -# Max heap size (for run target) -#maxHeapSize=256 diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/build.properties b/ext/styledmap/org.jdesktop.swingx.mapviewer/build.properties deleted file mode 100644 index b107977f4e..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -source.. = src/ -bin.includes = META-INF/,\ - . diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractBufferedImageTileCache.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractBufferedImageTileCache.java deleted file mode 100644 index ce1e8dc9f3..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractBufferedImageTileCache.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.jdesktop.swingx.mapviewer; - -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.graphics.GraphicsUtilities; - -/** - * AbstractBufferedImageTileCache - * - * @author Simon Templer - */ -public abstract class AbstractBufferedImageTileCache extends AbstractTileCache { - - private static final Log log = LogFactory.getLog(AbstractBufferedImageTileCache.class); - - /** - * @see AbstractTileCache#load(TileInfo) - */ - @Override - protected BufferedImage load(TileInfo tile) { - try { - return load(tile, openInputStream(tile.getURI())); - } catch (Exception e) { - log.error("Error loading tile", e); - return null; - } - } - - /** - * Load a tile from the given input stream - * - * @param tile the tile - * @param in the input stream - * - * @return the image that was loaded a put into the cache, may be - * null - */ - protected BufferedImage load(TileInfo tile, InputStream in) { - try { - try { - BufferedImage img = GraphicsUtilities.loadCompatibleImage(in); - if (img != null) { - doPut(tile, img); - } - return img; - } finally { - in.close(); - } - } catch (IOException e) { - log.error("Error loading tile", e); - return null; - } - } - - /** - * @see TileCache#get(TileInfo) - */ - @Override - public BufferedImage get(TileInfo tile) throws IOException { - BufferedImage img = doGet(tile); - if (img == null) { - img = load(tile); - } - return img; - } - - /** - * Get the image from the cache - * - * @param tile the tile info - * - * @return the cached image or null - */ - protected abstract BufferedImage doGet(TileInfo tile); - - /** - * Put an tile image into the cache - * - * @param tile the tile info - * @param image the tile image - */ - protected abstract void doPut(TileInfo tile, BufferedImage image); - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractPixelConverter.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractPixelConverter.java deleted file mode 100644 index 3d4f474c0e..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractPixelConverter.java +++ /dev/null @@ -1,33 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -/** - * AbstractPixelConverter - * - * @author Simon Templer - */ -public abstract class AbstractPixelConverter implements PixelConverter { - - /** - * The converter for {@link GeoPosition}s - */ - protected final GeoConverter geoConverter; - - /** - * Constructor - * - * @param geoConverter the geo converter - */ - public AbstractPixelConverter(GeoConverter geoConverter) { - this.geoConverter = geoConverter; - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractTileCache.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractTileCache.java deleted file mode 100644 index ba86e7c269..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractTileCache.java +++ /dev/null @@ -1,129 +0,0 @@ -package org.jdesktop.swingx.mapviewer; - -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.io.InputStream; -import java.net.Proxy; -import java.net.URI; -import java.util.HashMap; -import java.util.Map; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.jdesktop.swingx.mapviewer.DefaultTileFactory.TileRunner; - -import eu.esdihumboldt.hale.common.core.HalePlatform; -import eu.esdihumboldt.util.http.ProxyUtil; -import eu.esdihumboldt.util.http.client.ClientProxyUtil; -import eu.esdihumboldt.util.http.client.ClientUtil; - -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ - -/** - * AbstractTileCache - * - * @author Simon Templer - */ -public abstract class AbstractTileCache implements TileCache { - - private static final Log log = LogFactory.getLog(AbstractTileCache.class); - - private final Map clients = new HashMap(); - - /** - * Load the tile image - * - * @param tile the tile info - * @return the tile image or null if loading failed - */ - protected abstract BufferedImage load(TileInfo tile); - - /** - * Opens an input stream for the given URI, make sure to close it after user - * - * @param uri the URI - * @return the input stream - * @throws IOException - * @throws IllegalStateException - */ - @SuppressWarnings("javadoc") - protected InputStream openInputStream(URI uri) throws IllegalStateException, IOException { - if (!uri.getScheme().startsWith("http")) { - // open non-http uris (e.g. filesystem, jar entry) - return uri.toURL().openStream(); - } - else { - // open a http connection using the commons http client - Proxy proxy = ProxyUtil.findProxy(uri); - CloseableHttpClient client = getHttpClient(proxy); - - HttpGet get = new HttpGet(uri); - HttpResponse response = client.execute(get); - - int statusCode = response.getStatusLine().getStatusCode(); - - if (statusCode != HttpStatus.SC_OK) { - log.warn("Getting tile failed: " + response.getStatusLine()); - } - - return response.getEntity().getContent(); - } - } - - /** - * Provides a HTTP client for {@link TileRunner}s to use - * - * @param proxy the connection proxy - * @return the HTTP client - */ - protected synchronized CloseableHttpClient getHttpClient(Proxy proxy) { - CloseableHttpClient client = clients.get(proxy); - - if (client == null) { - HttpClientBuilder builder = ClientUtil.threadSafeHttpClientBuilder(null); - builder = ClientProxyUtil.applyProxy(builder, proxy); - // Set user agent according to RFC 9110 - // tile.openstreetmap.org will return HTTP 403 if no user agent is - // sent in the requests - builder.setUserAgent("hale-studio/" + HalePlatform.getCoreVersion().toString()); - - client = builder.build(); - - clients.put(proxy, client); - } - - return client; - } - - /** - * @see TileCache#clear() - */ - @Override - public synchronized void clear() { - // close and remove HTTP clients - - for (CloseableHttpClient client : clients.values()) { - try { - client.close(); - } catch (Exception e) { - log.debug("Error closing HTTP client", e); - } - } - - clients.clear(); - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractTileProvider.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractTileProvider.java deleted file mode 100644 index 1f960d7fd3..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractTileProvider.java +++ /dev/null @@ -1,86 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -import org.jdesktop.swingx.painter.Painter; - -/** - * AbstractTileProvider - * - * @author Simon Templer - */ -public abstract class AbstractTileProvider implements TileProvider { - - private PixelConverter converter; - - private boolean allowHorizontalWrapping = false; - private boolean drawTileBorders = false; - - /** - * Create the pixel converter - * - * @return the pixel converter - */ - protected abstract PixelConverter createConverter(); - - /** - * @see TileProvider#getConverter() - */ - @Override - public PixelConverter getConverter() { - if (converter == null) - converter = createConverter(); - - return converter; - } - - /** - * @see TileProvider#getAllowHorizontalWrapping() - */ - @Override - public boolean getAllowHorizontalWrapping() { - return allowHorizontalWrapping; - } - - /** - * @see TileProvider#getDrawTileBorders() - */ - @Override - public boolean getDrawTileBorders() { - return drawTileBorders; - } - - /** - * Set if tile borders shall be drawn for this map - * - * @param drawTileBorders if tile borders shall be drawn - */ - public void setDrawTileBorders(boolean drawTileBorders) { - this.drawTileBorders = drawTileBorders; - } - - /** - * Set if horizontal wrapping shall be allowed for this map - * - * @param allowHorizontalWrapping if horizontal mapping shall be allowed - */ - public void setAllowHorizontalWrapping(boolean allowHorizontalWrapping) { - this.allowHorizontalWrapping = allowHorizontalWrapping; - } - - /** - * @see TileProvider#getMapOverlayPainter() - */ - @Override - public Painter getMapOverlayPainter() { - return null; - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractTileProviderDecorator.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractTileProviderDecorator.java deleted file mode 100644 index 2f56fdefe5..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/AbstractTileProviderDecorator.java +++ /dev/null @@ -1,141 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -import java.net.URI; - -import org.jdesktop.swingx.painter.Painter; - -/** - * AbstractTileProviderDecorator - * - * @author Simon Templer - */ -public abstract class AbstractTileProviderDecorator implements TileProvider { - - /** - * The decorated tile provider - */ - protected final TileProvider tileProvider; - - /** - * Constructor - * - * @param tileProvider the tile provider to decorate - */ - public AbstractTileProviderDecorator(final TileProvider tileProvider) { - this.tileProvider = tileProvider; - } - - /** - * @see TileProvider#getAllowHorizontalWrapping() - */ - @Override - public boolean getAllowHorizontalWrapping() { - return tileProvider.getAllowHorizontalWrapping(); - } - - /** - * @see TileProvider#getConverter() - */ - @Override - public PixelConverter getConverter() { - return tileProvider.getConverter(); - } - - /** - * @see TileProvider#getDefaultZoom() - */ - @Override - public int getDefaultZoom() { - return tileProvider.getDefaultZoom(); - } - - /** - * @see TileProvider#getDrawTileBorders() - */ - @Override - public boolean getDrawTileBorders() { - return tileProvider.getDrawTileBorders(); - } - - /** - * @see TileProvider#getMapHeightInTiles(int) - */ - @Override - public int getMapHeightInTiles(int zoom) { - return tileProvider.getMapHeightInTiles(zoom); - } - - /** - * @see TileProvider#getMapWidthInTiles(int) - */ - @Override - public int getMapWidthInTiles(int zoom) { - return tileProvider.getMapWidthInTiles(zoom); - } - - /** - * @see TileProvider#getMaximumZoom() - */ - @Override - public int getMaximumZoom() { - return tileProvider.getMaximumZoom(); - } - - /** - * @see TileProvider#getMinimumZoom() - */ - @Override - public int getMinimumZoom() { - return tileProvider.getMinimumZoom(); - } - - /** - * @see TileProvider#getTileHeight(int) - */ - @Override - public int getTileHeight(int zoom) { - return tileProvider.getTileHeight(zoom); - } - - /** - * @see TileProvider#getTileWidth(int) - */ - @Override - public int getTileWidth(int zoom) { - return tileProvider.getTileWidth(zoom); - } - - /** - * @see TileProvider#getTileUris(int, int, int) - */ - @Override - public URI[] getTileUris(int x, int y, int zoom) { - return tileProvider.getTileUris(x, y, zoom); - } - - /** - * @see TileProvider#getTotalMapZoom() - */ - @Override - public int getTotalMapZoom() { - return tileProvider.getTotalMapZoom(); - } - - /** - * @see TileProvider#getMapOverlayPainter() - */ - @Override - public Painter getMapOverlayPainter() { - return tileProvider.getMapOverlayPainter(); - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/BasicTileProvider.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/BasicTileProvider.java deleted file mode 100644 index 4b99c37b9f..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/BasicTileProvider.java +++ /dev/null @@ -1,96 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -/** - * BasicTileProvider - * - * @author Simon Templer - */ -public abstract class BasicTileProvider extends AbstractTileProvider { - - private final int defaultZoom; - private final int minimumZoom; - private final int maximumZoom; - private final int totalMapZoom; - - private final int tileWidth; - private final int tileHeight; - - /** - * Constructor - * - * @param defaultZoom the default zoom level - * @param minimumZoom the minimum zoom level - * @param maximumZoom the maximum zoom level - * @param totalMapZoom the top zoom level - * @param tileWidth the tile width - * @param tileHeight the tile height - */ - public BasicTileProvider(final int defaultZoom, final int minimumZoom, final int maximumZoom, - final int totalMapZoom, final int tileWidth, final int tileHeight) { - super(); - this.defaultZoom = defaultZoom; - this.minimumZoom = minimumZoom; - this.maximumZoom = maximumZoom; - this.totalMapZoom = totalMapZoom; - this.tileWidth = tileWidth; - this.tileHeight = tileHeight; - } - - /** - * @see TileProvider#getDefaultZoom() - */ - @Override - public int getDefaultZoom() { - return defaultZoom; - } - - /** - * @see TileProvider#getMaximumZoom() - */ - @Override - public int getMaximumZoom() { - return maximumZoom; - } - - /** - * @see TileProvider#getMinimumZoom() - */ - @Override - public int getMinimumZoom() { - return minimumZoom; - } - - /** - * @see TileProvider#getTileHeight(int) - */ - @Override - public int getTileHeight(int zoom) { - return tileHeight; - } - - /** - * @see TileProvider#getTileWidth(int) - */ - @Override - public int getTileWidth(int zoom) { - return tileWidth; - } - - /** - * @see TileProvider#getTotalMapZoom() - */ - @Override - public int getTotalMapZoom() { - return totalMapZoom; - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/CachingTileProviderDecorator.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/CachingTileProviderDecorator.java deleted file mode 100644 index 125c465cc9..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/CachingTileProviderDecorator.java +++ /dev/null @@ -1,104 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -import java.net.URI; - -/** - * CachingTileProviderDecorator - * - * @author Simon Templer - */ -public class CachingTileProviderDecorator extends AbstractTileProviderDecorator { - - private final int[] width; - private final int[] height; - private final int[] tileWidth; - private final int[] tileHeight; - - /** - * @param tileProvider the wrapped tile provider - */ - public CachingTileProviderDecorator(TileProvider tileProvider) { - super(tileProvider); - - width = new int[tileProvider.getMaximumZoom() - tileProvider.getMinimumZoom() + 1]; - height = new int[tileProvider.getMaximumZoom() - tileProvider.getMinimumZoom() + 1]; - tileWidth = new int[tileProvider.getMaximumZoom() - tileProvider.getMinimumZoom() + 1]; - tileHeight = new int[tileProvider.getMaximumZoom() - tileProvider.getMinimumZoom() + 1]; - - for (int i = 0; i <= tileProvider.getMaximumZoom() - tileProvider.getMinimumZoom(); i++) { - // preget width, height and tilesize values - int zoom = i + tileProvider.getMinimumZoom(); - width[i] = tileProvider.getMapWidthInTiles(zoom); - height[i] = tileProvider.getMapHeightInTiles(zoom); - tileWidth[i] = tileProvider.getTileWidth(zoom); - tileHeight[i] = tileProvider.getTileHeight(zoom); - } - } - - /** - * @see AbstractTileProviderDecorator#getMapHeightInTiles(int) - */ - @Override - public int getMapHeightInTiles(int zoom) { - int index = zoom - tileProvider.getMinimumZoom(); - if (index >= 0 && index < height.length) - return height[index]; - else - return tileProvider.getMapHeightInTiles(zoom); - } - - /** - * @see AbstractTileProviderDecorator#getMapWidthInTiles(int) - */ - @Override - public int getMapWidthInTiles(int zoom) { - int index = zoom - tileProvider.getMinimumZoom(); - if (index >= 0 && index < width.length) - return width[index]; - else - return tileProvider.getMapWidthInTiles(zoom); - } - - /** - * @see AbstractTileProviderDecorator#getTileHeight(int) - */ - @Override - public int getTileHeight(int zoom) { - int index = zoom - tileProvider.getMinimumZoom(); - if (index >= 0 && index < tileHeight.length) - return tileHeight[index]; - else - return tileProvider.getTileHeight(zoom); - } - - /** - * @see AbstractTileProviderDecorator#getTileWidth(int) - */ - @Override - public int getTileWidth(int zoom) { - int index = zoom - tileProvider.getMinimumZoom(); - if (index >= 0 && index < tileWidth.length) - return tileWidth[index]; - else - return tileProvider.getTileWidth(zoom); - } - - /** - * @see AbstractTileProviderDecorator#getTileUris(int, int, int) - */ - @Override - public URI[] getTileUris(int x, int y, int zoom) { - // TODO cache tile uris? - return super.getTileUris(x, y, zoom); - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/DefaultTileCache.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/DefaultTileCache.java deleted file mode 100644 index 10167a2cdd..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/DefaultTileCache.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * TileCache.java - * - * Created on January 2, 2007, 7:17 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer; - -import java.awt.image.BufferedImage; -import java.net.URI; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; - -/** - * An implementation only class for now. For internal use only. - * - * @author joshua.marinacci@sun.com - */ -public class DefaultTileCache extends AbstractBufferedImageTileCache { - - private final Map imgmap = new HashMap(); - private final LinkedList imgmapAccessQueue = new LinkedList(); - private int imagesize = 0; - - // private Map bytemap = new HashMap(); - // private LinkedList bytemapAccessQueue = new LinkedList(); - // private int bytesize = 0; - - /** - * Default constuctor. - */ - public DefaultTileCache() { - } - - /** - * @see AbstractBufferedImageTileCache#doPut(TileInfo, BufferedImage) - */ - @Override - protected void doPut(TileInfo tile, BufferedImage image) { - addToImageCache(tile.getIdentifier(), image); - } - - /** - * @see AbstractBufferedImageTileCache#doGet(TileInfo) - */ - @Override - public BufferedImage doGet(TileInfo tile) { - URI uri = tile.getIdentifier(); - synchronized (imgmap) { - if (imgmap.containsKey(uri)) { - imgmapAccessQueue.remove(uri); - imgmapAccessQueue.addLast(uri); - return imgmap.get(uri); - } - } - /* - * synchronized (bytemap) { if (bytemap.containsKey(uri)) { p( - * "retrieving from bytes"); bytemapAccessQueue.remove(uri); - * bytemapAccessQueue.addLast(uri); BufferedImage img = ImageIO.read(new - * ByteArrayInputStream(bytemap.get(uri))); addToImageCache(uri, img); - * return img; } } - */ - return null; - } - - /** - * @see TileCache#clear() - */ - @Override - public void clear() { - imgmap.clear(); - p("HACK! need more memory: freeing up memory"); - } - - private void addToImageCache(final URI uri, final BufferedImage img) { - if (img == null) - return; - - synchronized (imgmap) { - while (imagesize > 1000 * 1000 * 50 && !imgmapAccessQueue.isEmpty()) { - URI olduri = imgmapAccessQueue.removeFirst(); - BufferedImage oldimg = imgmap.remove(olduri); - if (oldimg != null) { - imagesize -= oldimg.getWidth() * oldimg.getHeight() * 4; - } - p("removed 1 img from image cache"); - } - - imgmap.put(uri, img); - imagesize += img.getWidth() * img.getHeight() * 4; - imgmapAccessQueue.addLast(uri); - } - /* - * p("added to cache: " + " uncompressed = " + imgmap.keySet().size() + - * " / " + imagesize / 1000 + "k" + " compressed = " + - * bytemap.keySet().size() + " / " + bytesize / 1000 + "k"); - */ - } - - @SuppressWarnings("unused") - private void p(String string) { - // System.out.println(string); - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/DefaultTileFactory.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/DefaultTileFactory.java deleted file mode 100644 index e0bae6bb15..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/DefaultTileFactory.java +++ /dev/null @@ -1,430 +0,0 @@ -package org.jdesktop.swingx.mapviewer; - -import java.awt.image.BufferedImage; -import java.lang.ref.SoftReference; -import java.net.URI; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.PriorityBlockingQueue; -import java.util.concurrent.ThreadFactory; - -import javax.swing.SwingUtilities; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -/** - * The DefaultTileFactory (was AbstractTileFactory) provides a - * basic implementation for the TileFactory. - * - * @author unknown - * @author Simon Templer - * - * @version $Id$ - */ -public class DefaultTileFactory implements TileFactory { - - private static final Log log = LogFactory.getLog(DefaultTileFactory.class); - - private int threadPoolSize = 2; - private ExecutorService service; - - private final TileProvider provider; - - // TODO the tile map should be static ALWAYS, regardless of the number - // of GoogleTileFactories because each tile is, really, a singleton. - private final Map tileMap = new HashMap(); - - private TileCache cache; - - /** - * Create a {@link TileFactory} using a {@link TileProvider} - * - * @param provider the {@link TileProvider} - * @param cache the tile cache to use - */ - public DefaultTileFactory(TileProvider provider, TileCache cache) { - this.provider = provider; - this.cache = cache; - } - - /** - * Returns the tile that is located at the given tile point for this zoom. - * - * @param x the tile's x coordinate - * @param y the tile's y coordinate - * @param zoom the zoom level - * - * @return the tile for the given coordinates and zoom level - */ - @Override - public Tile getTile(int x, int y, int zoom) { - return getTile(x, y, zoom, true); - } - - private Tile getTile(int tpx, int tpy, int zoom, boolean eagerLoad) { - // wrap the tiles horizontally --> mod the X with the max width and use - // that - int tileX = tpx; - - int numTilesWide = provider.getMapWidthInTiles(zoom); - - if (tileX < 0) { - tileX = numTilesWide - (Math.abs(tileX) % numTilesWide); - } - - tileX = tileX % numTilesWide; - - int tileY = tpy; - URI[] uris; - if (TileProviderUtils.isValidTile(provider, tileX, tileY, zoom)) { - try { - uris = provider.getTileUris(tileX, tileY, zoom); - } catch (Exception e) { - uris = null; - log.warn("Error getting tile urls", e); - } - } - else { - uris = null; - log.warn( - "Invalid tile requested: x = " + tileX + ", y = " + tileY + ", zoom = " + zoom); - } - - Tile.Priority pri = Tile.Priority.High; - if (!eagerLoad) { - pri = Tile.Priority.Low; - } - Tile tile = null; - - if (uris == null || uris.length == 0) { - // invalid/empty tile - tile = new Tile(tileX, tileY, zoom); - } - else if (!tileMap.containsKey(uris[0].toString())) { - // tile not found -> create new tile - tile = new Tile(tileX, tileY, zoom, pri, this, uris); - startLoading(tile); - tileMap.put(uris[0].toString(), tile); - } - else { - // retrieve tile from map - tile = tileMap.get(uris[0].toString()); - // if its in the map but is low and isn't loaded yet - // but we are in high mode - if (tile.getPriority() == Tile.Priority.Low && eagerLoad && !tile.isLoaded()) { - promote(tile); - } - } - - /* - * if (eagerLoad && doEagerLoading) { for (int i = 0; i<1; i++) { for - * (int j = 0; j<1; j++) { // preload the 4 tiles under the current one - * if(zoom > 0) { eagerlyLoad(tilePoint.getX()*2, tilePoint.getY()*2, - * zoom-1); eagerlyLoad(tilePoint.getX()*2+1, tilePoint.getY()*2, - * zoom-1); eagerlyLoad(tilePoint.getX()*2, tilePoint.getY()*2+1, - * zoom-1); eagerlyLoad(tilePoint.getX()*2+1, tilePoint.getY()*2+1, - * zoom-1); } } } } - */ - - return tile; - } - - /** - * Get the tile cache - * - * @return the tile cache - */ - public TileCache getTileCache() { - return cache; - } - - /** - * Set the tile cache - * - * @param cache the tile cache - */ - public void setTileCache(TileCache cache) { - this.cache = cache; - } - - /** ==== threaded tile loading stuff === */ - /** - * Thread pool for loading the tiles - */ - private final BlockingQueue tileQueue = new PriorityBlockingQueue(5, - new Comparator() { - - @Override - public int compare(Tile o1, Tile o2) { - if (o1.getPriority() == Tile.Priority.Low - && o2.getPriority() == Tile.Priority.High) { - return 1; - } - if (o1.getPriority() == Tile.Priority.High - && o2.getPriority() == Tile.Priority.Low) { - return -1; - } - return 0; - - } - - @Override - public int hashCode() { - return super.hashCode(); - } - - @Override - public boolean equals(Object obj) { - return obj == this; - } - }); - - /** - * Subclasses may override this method to provide their own executor - * services. This method will be called each time a tile needs to be loaded. - * Implementations should cache the ExecutorService when possible. - * - * @return ExecutorService to load tiles with - */ - protected synchronized ExecutorService getService() { - if (service == null) { - // System.out.println("creating an executor service with a - // threadpool of size " + threadPoolSize); - service = Executors.newFixedThreadPool(threadPoolSize, new ThreadFactory() { - - private int count = 0; - - @Override - public Thread newThread(Runnable r) { - Thread t = new Thread(r, "tile-pool-" + count++); - t.setPriority(Thread.MIN_PRIORITY); - t.setDaemon(true); - return t; - } - }); - } - return service; - } - - /** - * Set the number of threads to use for loading the tiles. This controls the - * number of threads used by the ExecutorService returned from getService(). - * Note, this method should be called before loading the first tile. Calls - * after the first tile are loaded will have no effect by default. - * - * @param size the thread pool size - */ - public synchronized void setThreadPoolSize(int size) { - if (size <= 0) { - throw new IllegalArgumentException("size invalid: " + size - + ". The size of the threadpool must be greater than 0."); - } - threadPoolSize = size; - } - - /** - * Start loading a tile - * - * @param tile the tile to start loading - */ - @Override - public synchronized void startLoading(Tile tile) { - if (tile.isLoading()) { - System.out.println("already loading. bailing"); - return; - } - tile.setLoading(true); - try { - tileQueue.put(tile); - if (!getService().isShutdown()) { - getService().submit(createTileRunner(tile)); - } - } catch (Exception ex) { - ex.printStackTrace(); - } - } - - /** - * Subclasses can override this if they need custom TileRunners for some - * reason - * - * @param tile the tile to be loaded - * - * @return a tile runner - */ - protected Runnable createTileRunner(TileInfo tile) { - return new TileRunner(); - } - - /** - * Increase the priority of this tile so it will be loaded sooner. - * - * @param tile the tile for which to increase the priority - */ - public synchronized void promote(Tile tile) { - if (tileQueue.contains(tile)) { - try { - tileQueue.remove(tile); - tile.setPriority(Tile.Priority.High); - tileQueue.put(tile); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - } - - /** - * An inner class which actually loads the tiles. Used by the thread queue. - * Subclasses can override this if necessary. - */ - public class TileRunner implements Runnable { - - /** - * @return the maximum number of tries to fetch a tile - */ - protected int maxTries() { - return 3; - } - - /** - * Called when loading failed and there are tries left - * - * @param tile the tile to load - * @param triesLeft number of tries left - * @param error the error that occurred (if available) - */ - protected void onRetry(TileInfo tile, int triesLeft, Throwable error) { - log.debug("Failed to load tile: " + tile.getURI() + " - Retrying", error); - } - - /** - * Called when loading of a tile failed in all tries - * - * @param tile the tile to load - * @param error the error that occurred last (if available) - */ - protected void onFailed(TileInfo tile, Throwable error) { - log.warn("Failed to load tile: " + tile.getURI(), error); - } - - /** - * Called when a tile was successfully loaded - * - * @param tile the tile - */ - protected void onLoaded(TileInfo tile) { - // do nothing - } - - /** - * Called loading of a tile failed because there was not enough memory - * - * @param tile the tile to load - */ - protected void onOutOfMem(TileInfo tile) { - log.error("Failed to load tile: " + tile.getURI() + " - Not enough memory"); -// cache.clear(); - } - - /** - * implementation of the Runnable interface. - */ - @Override - public void run() { - // get a tile out of the queue - final Tile tile = tileQueue.remove(); - - // XXX tries handled by HttpClient? - int trys = maxTries(); - - try { - while (!tile.isLoaded() && trys > 0) { - try { - BufferedImage img = null; - img = cache.get(tile); - if (img == null) { - trys--; - - if (trys == 0) - // tile loading failed - onFailed(tile, null); - else { - // give it another try - onRetry(tile, trys, null); - tile.notifyBeforeRetry(); - } - } - else { - final BufferedImage i = img; - SwingUtilities.invokeAndWait(new Runnable() { - - @Override - public void run() { - try { - tile.image = new SoftReference(i); - tile.setLoaded(true); - // tile was succesfully loaded - onLoaded(tile); - } catch (Exception e) { - log.error(e.getMessage(), e); - } - } - }); - } - } catch (OutOfMemoryError memErr) { - onOutOfMem(tile); - trys = 0; - } catch (Throwable e) { - Object oldError = tile.getError(); - tile.setError(e); - tile.firePropertyChangeOnEDT("loadingError", oldError, e); - if (trys == 0) { - tile.firePropertyChangeOnEDT("unrecoverableError", null, e); - } - else { - trys--; - } - - if (trys == 0) - onFailed(tile, e); - else - onRetry(tile, trys, e); - } - } - } finally { - tile.setLoading(false); - } - } - } - - /** - * @see TileFactory#getTileProvider() - */ - @Override - public TileProvider getTileProvider() { - return provider; - } - - /** - * @see TileFactory#cleanup() - */ - @Override - public void cleanup() { - getService().shutdownNow(); - clearCache(); - } - - /** - * @see TileFactory#clearCache() - */ - @Override - public void clearCache() { - getTileCache().clear(); -// setTileCache(new DefaultTileCache()); - } -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/DefaultWaypoint.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/DefaultWaypoint.java deleted file mode 100644 index b59f46ba78..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/DefaultWaypoint.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Waypoint.java - * - * Created on March 30, 2006, 5:22 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer; - -/** - * - * @author joshy - */ -public class DefaultWaypoint extends Waypoint { - - private GeoPosition position; - - /** Creates a new instance of Waypoint */ - public DefaultWaypoint() { - this(new GeoPosition(0, 0, GeoPosition.WGS_84_EPSG)); - } - - /** - * Constructor - * - * @param latitude the latitude - * @param longitude the longitude - */ - public DefaultWaypoint(double latitude, double longitude) { - this(new GeoPosition(latitude, longitude, GeoPosition.WGS_84_EPSG)); - } - - /** - * Constructor - * - * @param coord the way-point's position - */ - public DefaultWaypoint(GeoPosition coord) { - this.position = coord; - } - - /** - * Get the way-point position - * - * @return the way-point position - */ - @Override - public GeoPosition getPosition() { - return position; - } - - /** - * Set the way-point position - * - * @param coordinate the way-point position - */ - @Override - public void setPosition(GeoPosition coordinate) { - GeoPosition old = getPosition(); - this.position = coordinate; - firePropertyChange("position", old, getPosition()); - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/DefaultWaypointRenderer.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/DefaultWaypointRenderer.java deleted file mode 100644 index cea395895b..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/DefaultWaypointRenderer.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * WaypointRenderer.java - * - * Created on March 30, 2006, 5:24 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer; - -import java.awt.BasicStroke; -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.image.BufferedImage; -import javax.imageio.ImageIO; - -/** - * This is a standard waypoint renderer. It draws all waypoints as blue circles - * with crosshairs over the waypoint center - * - * @author joshy - */ -public class DefaultWaypointRenderer implements WaypointRenderer { - - BufferedImage img = null; - - /** - * Default constructor - */ - public DefaultWaypointRenderer() { - try { - img = ImageIO.read(getClass().getResource("resources/standard_waypoint.png")); - } catch (Exception ex) { - System.out.println("couldn't read standard_waypoint.png"); - System.out.println(ex.getMessage()); - ex.printStackTrace(); - } - } - - /** - * @see WaypointRenderer#paintWaypoint(Graphics2D, JXMapViewer, Waypoint) - */ - @Override - public boolean paintWaypoint(Graphics2D g, JXMapViewer map, Waypoint waypoint) { - if (img != null) { - g.drawImage(img, -img.getWidth() / 2, -img.getHeight(), null); - } - else { - g.setStroke(new BasicStroke(3f)); - g.setColor(Color.BLUE); - g.drawOval(-10, -10, 20, 20); - g.setStroke(new BasicStroke(1f)); - g.drawLine(-10, 0, 10, 0); - g.drawLine(0, -10, 0, 10); - } - return false; - } -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GeoBounds.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GeoBounds.java deleted file mode 100644 index 3fa00d3183..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GeoBounds.java +++ /dev/null @@ -1,143 +0,0 @@ -package org.jdesktop.swingx.mapviewer; - -/** - * The GeoBounds class provides access the the North East and South - * West corners of the bounds and provides an intersects method. - * - * @author Dan Andrews - */ -//public class GeoBounds { -// -// /** Internal representation of the bounds */ -// private Rectangle2D[] rects; -// -// /** -// * Constructor. -// * -// * @param minLat -// * The minimum latitude. -// * @param minLng -// * The minimum longitude. -// * @param maxLat -// * The maximum latitude. -// * @param maxLng -// * The maximum longitude. -// */ -// public GeoBounds(double minLat, double minLng, double maxLat, double maxLng) { -// setRect(minLat, minLng, maxLat, maxLng); -// } -// -// /** -// * Constructor. -// * -// * @param geoPositions -// * A non null list of 2 or more different GeoBounds -// * objects. -// */ -// public GeoBounds(Set geoPositions) { -// if (geoPositions == null || geoPositions.size() < 2) { -// throw new IllegalArgumentException( -// "The attribute 'geoPositions' cannot be null and must " -// + "have 2 or more elements."); -// } -// double minLat = Integer.MAX_VALUE; -// double minLng = Integer.MAX_VALUE; -// double maxLat = Integer.MIN_VALUE; -// double maxLng = Integer.MIN_VALUE; -// for (GeoPosition position : geoPositions) { -// minLat = Math.min(minLat, position.getY()); -// minLng = Math.min(minLng, position.getX()); -// maxLat = Math.max(maxLat, position.getY()); -// maxLng = Math.max(maxLng, position.getX()); -// } -// setRect(minLat, minLng, maxLat, maxLng); -// } -// -// /** -// * Sets the internal rectangle representation. -// * -// * @param minLat -// * The minimum latitude. -// * @param minLng -// * The minimum longitude. -// * @param maxLat -// * The maximum latitude. -// * @param maxLng -// * The maximum longitude. -// */ -// private void setRect(double minLat, double minLng, double maxLat, -// double maxLng) { -// if (!(minLat < maxLat)) { -// throw new IllegalArgumentException( -// "GeoBounds is not valid - minLat must be less that maxLat."); -// } -// if (!(minLng < maxLng)) { -// if (minLng > 0 && minLng < 180 && maxLng < 0) { -// rects = new Rectangle2D[] { -// // split into two rects e.g. 176.8793 to 180 and -180 to -// // -175.0104 -// new Rectangle2D.Double(minLng, minLat, 180 - minLng, -// maxLat - minLat), -// new Rectangle2D.Double(-180, minLat, maxLng + 180, -// maxLat - minLat) }; -// } else { -// rects = new Rectangle2D[] { new Rectangle2D.Double(minLng, -// minLat, maxLng - minLng, maxLat - minLat) }; -// -// throw new IllegalArgumentException( -// "GeoBounds is not valid - minLng must be less that maxLng or " -// + "minLng must be greater than 0 and maxLng must be less than 0."); -// } -// } else { -// rects = new Rectangle2D[] { new Rectangle2D.Double(minLng, minLat, -// maxLng - minLng, maxLat - minLat) }; -// } -// } -// -// /** -// * Determines if this bounds intersects the other bounds. -// * -// * @param other -// * The other bounds to test for intersection with. -// * @return Returns true if bounds intersect. -// */ -// public boolean intersects(GeoBounds other) { -// boolean rv = false; -// for (Rectangle2D r1 : rects) { -// for (Rectangle2D r2 : other.rects) { -// rv = r1.intersects(r2); -// if (rv) { -// break; -// } -// } -// if (rv) { -// break; -// } -// -// } -// return rv; -// } -// -// /** -// * Gets the north west position. -// * -// * @return Returns the north west position. -// */ -// public GeoPosition getNorthWest() { -// return new GeoPosition(rects[0].getX(), rects[0].getMaxY()); -// } -// -// /** -// * Gets the south east position. -// * -// * @return Returns the south east position. -// */ -// public GeoPosition getSouthEast() { -// Rectangle2D r = rects[0]; -// if (rects.length > 1) { -// r = rects[1]; -// } -// return new GeoPosition(r.getMaxX(), r.getY()); -// } -// -//} \ No newline at end of file diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GeoConverter.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GeoConverter.java deleted file mode 100644 index 1b483a66b8..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GeoConverter.java +++ /dev/null @@ -1,32 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -/** - * GeoPositionConverter - * - * @author Simon Templer - */ -public interface GeoConverter { - - /** - * Tries to convert the given {@link GeoPosition} to the coordinate - * reference system specified by the given target epsg code. - * - * @param pos the {@link GeoPosition} to convert - * @param targetEpsg the epsg code of the target coordinate reference system - * - * @return the converted {@link GeoPosition} - * @throws IllegalGeoPositionException if the given {@link GeoPosition} is - * invalid or conversion failed - */ - public abstract GeoPosition convert(GeoPosition pos, int targetEpsg) - throws IllegalGeoPositionException; -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GeoPosition.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GeoPosition.java deleted file mode 100644 index 337b52af92..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GeoPosition.java +++ /dev/null @@ -1,155 +0,0 @@ -/* - * GeoPosition.java - * - * Created on March 31, 2006, 9:15 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer; - -/** - * An immutable coordinate in the real (geographic) world, composed of a x and y - * coordinate and the corresponding epsg code. - * - * @author rbair - * @author Simon Templer - * - * @version $Id$ - */ -public class GeoPosition { - - /** - * The epsg code for the WGS84 coordinate reference system (long/lat) - */ - public static final int WGS_84_EPSG = 4326; - - private double y; /* or latitude */ - private double x; /* or longitude */ - - private int epsg; - - /** - * Creates a new instance of GeoPosition from the specified x and y - * coordinates. - * - * @param x the x coordinate - * @param y the y coordinate - * @param epsg the coordinate reference system epsg code - */ - public GeoPosition(double x, double y, int epsg) { - this.y = y; - this.x = x; - - this.epsg = epsg; - } - - /** - * Creates a new instance of GeoPosition from the specified latitude ant - * longitude in the WGS84 coordinate reference system. - * - * @param latitude the latitude - * @param longitude the longitude - */ - private GeoPosition(double latitude, double longitude) { - this.y = latitude; - this.x = longitude; - - this.epsg = WGS_84_EPSG; - } - - /** - * Creates a new instance of GeoPosition from the specified latitude and - * longitude. Each are specified as degrees, minutes, and seconds; not as - * decimal degrees. Use the other constructor for those. - * - * @param latDegrees the degrees part of the current latitude - * @param latMinutes the minutes part of the current latitude - * @param latSeconds the seconds part of the current latitude - * @param lonDegrees the degrees part of the current longitude - * @param lonMinutes the minutes part of the current longitude - * @param lonSeconds the seconds part of the current longitude - */ - public GeoPosition(double latDegrees, double latMinutes, double latSeconds, double lonDegrees, - double lonMinutes, double lonSeconds) { - this(latDegrees + (latMinutes + latSeconds / 60.0) / 60.0, - lonDegrees + (lonMinutes + lonSeconds / 60.0) / 60.0); - } - - /** - * Get the y coordinate - * - * @return the y coordinate - */ - public double getY() { - return y; - } - - /** - * Get the x coordinate - * - * @return the x coordinate - */ - public double getX() { - return x; - } - - /** - * Get the epsg code - * - * @return the epsg code - */ - public int getEpsgCode() { - return epsg; - } - - /** - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + epsg; - long temp; - temp = Double.doubleToLongBits(x); - result = prime * result + (int) (temp ^ (temp >>> 32)); - temp = Double.doubleToLongBits(y); - result = prime * result + (int) (temp ^ (temp >>> 32)); - return result; - } - - /** - * Returns true the specified GeoPosition and this GeoPosition represent the - * exact same coordinates in the same coordinate system - * - * @param obj a GeoPosition to compare this GeoPosition to - * @return returns true if the specified GeoPosition is equal to this one - */ - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - GeoPosition other = (GeoPosition) obj; - if (epsg != other.epsg) - return false; - if (Double.doubleToLongBits(x) != Double.doubleToLongBits(other.x)) - return false; - if (Double.doubleToLongBits(y) != Double.doubleToLongBits(other.y)) - return false; - return true; - } - - /** - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "[" + x + ", " + y + " (" + epsg + ")]"; - } -} \ No newline at end of file diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GeotoolsConverter.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GeotoolsConverter.java deleted file mode 100644 index 72394f4cbc..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GeotoolsConverter.java +++ /dev/null @@ -1,170 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ConcurrentMap; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.geotools.geometry.GeneralDirectPosition; -import org.geotools.referencing.CRS; -import org.opengis.geometry.DirectPosition; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.NoSuchAuthorityCodeException; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.cs.AxisDirection; -import org.opengis.referencing.operation.MathTransform; - -import com.google.common.cache.CacheBuilder; - -/** - * GeotoolsConverter - * - * @author Simon Templer - */ -public class GeotoolsConverter implements GeoConverter { - - private static final Log log = LogFactory.getLog(GeotoolsConverter.class); - - private static GeotoolsConverter INSTANCE; - - private final ConcurrentMap crsMap = CacheBuilder - .newBuilder().softValues(). build().asMap(); - - private final ConcurrentMap transforms = CacheBuilder.newBuilder() - .softValues(). build().asMap(); - - /** - * Get a GeotoolsConverter instance - * - * @return the converter instance - */ - public static GeoConverter getInstance() { - if (INSTANCE == null) { - INSTANCE = new GeotoolsConverter(); - } - - return INSTANCE; - } - - private GeotoolsConverter() { - } - - private CoordinateReferenceSystem getCRS(int epsg) - throws NoSuchAuthorityCodeException, FactoryException { - CoordinateReferenceSystem r = crsMap.get(epsg); - if (r == null) { - r = CRS.decode("EPSG:" + epsg, true); - crsMap.put(epsg, r); - } - return r; - } - - private MathTransform getTransform(int srcEpsg, int targetEpsg, - CoordinateReferenceSystem sourceCRS, CoordinateReferenceSystem targetCRS) - throws FactoryException { - long key = srcEpsg; - key <<= Integer.SIZE; - key |= targetEpsg; - - MathTransform r = transforms.get(key); - if (r == null) { - r = CRS.findMathTransform(sourceCRS, targetCRS, true); - transforms.put(key, r); - } - return r; - } - - /** - * @see GeoConverter#convert(GeoPosition, int) - */ - @Override - public GeoPosition convert(GeoPosition pos, int targetEpsg) throws IllegalGeoPositionException { - - if (targetEpsg == pos.getEpsgCode()) - return new GeoPosition(pos.getX(), pos.getY(), targetEpsg); - - try { - CoordinateReferenceSystem sourceCRS = getCRS(pos.getEpsgCode()); - CoordinateReferenceSystem targetCRS = getCRS(targetEpsg); - MathTransform math = getTransform(pos.getEpsgCode(), targetEpsg, sourceCRS, targetCRS); - - int dimension = sourceCRS.getCoordinateSystem().getDimension(); - DirectPosition pt1; - - boolean flipSource = flipCRS(sourceCRS); - - switch (dimension) { - case 2: - pt1 = new GeneralDirectPosition((flipSource) ? (pos.getY()) : (pos.getX()), - (flipSource) ? (pos.getX()) : (pos.getY())); - break; - case 3: - pt1 = new GeneralDirectPosition((flipSource) ? (pos.getY()) : (pos.getX()), - (flipSource) ? (pos.getX()) : (pos.getY()), 0); - break; - default: - log.error("Unsupported dimension: " + dimension); - throw new IllegalArgumentException("Unsupported dimension: " + dimension); - } - - DirectPosition pt2 = math.transform(pt1, null); - - if (flipCRS(targetCRS)) - return new GeoPosition(pt2.getOrdinate(1), pt2.getOrdinate(0), targetEpsg); - else - return new GeoPosition(pt2.getOrdinate(0), pt2.getOrdinate(1), targetEpsg); - } catch (Exception e) { - throw new IllegalGeoPositionException(e); - } - } - - /** - * Tries to convert the given list of {@link GeoPosition} to the coordinate - * reference system specified by the given target epsg code. - * - * @param positions a list containing {@link GeoPosition} to convert - * @param epsg the epsg code of the target coordinate reference system - * - * @return the converted list of {@link GeoPosition} - * @throws IllegalGeoPositionException if the given {@link GeoPosition} is - * invalid or conversion failed - */ - public List convertAll(List positions, int epsg) - throws IllegalGeoPositionException { - List newPositions = new ArrayList(positions.size()); - - for (int i = 0; i < positions.size(); i++) { - newPositions.add(this.convert(positions.get(i), epsg)); - } - - return newPositions; - } - - /** - * This method checks if the the CoordinateSystem is in the way we expected, - * or if we have to flip the coordinates. - * - * @param crs The CRS to be checked. - * @return True, if we have to flip the coordinates - */ - private boolean flipCRS(CoordinateReferenceSystem crs) { - if (crs.getCoordinateSystem().getDimension() == 2) { - AxisDirection direction = crs.getCoordinateSystem().getAxis(0).getDirection(); - if (direction.equals(AxisDirection.NORTH) || direction.equals(AxisDirection.UP)) { - return true; - } - } - return false; - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GoogleMercatorConverter.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GoogleMercatorConverter.java deleted file mode 100644 index 61cf3b9aab..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/GoogleMercatorConverter.java +++ /dev/null @@ -1,102 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -import java.awt.geom.Point2D; - -/** - * Google Mercator projection converter providing WGS84 GeoPositions. Usable - * with world maps using Google like Mercator projection. - * - * @author Simon Templer - */ -public class GoogleMercatorConverter extends AbstractPixelConverter { - - private final TileProvider tileProvider; - - /** - * Constructor - * - * @param tileProvider the tile provider - * @param geoConverter the geo converter - */ - public GoogleMercatorConverter(TileProvider tileProvider, GeoConverter geoConverter) { - super(geoConverter); - - this.tileProvider = tileProvider; - } - - private double getLongitudeDegreeWidthInPixels(int zoom) { - return tileProvider.getMapWidthInTiles(zoom) * tileProvider.getTileWidth(zoom) / 360.0; - } - - private double getLongitudeRadianWidthInPixels(int zoom) { - return tileProvider.getMapWidthInTiles(zoom) * tileProvider.getTileWidth(zoom) - / (2.0 * Math.PI); - } - - /** - * @see PixelConverter#geoToPixel(GeoPosition, int) - */ - @Override - public Point2D geoToPixel(GeoPosition pos, int zoom) throws IllegalGeoPositionException { - // convert to WGS84 long/lat - pos = geoConverter.convert(pos, GeoPosition.WGS_84_EPSG); - - double x = TileProviderUtils.getMapCenterInPixels(tileProvider, zoom).getX() - + pos.getX() /* long */ * getLongitudeDegreeWidthInPixels(zoom); - double e = Math.sin(pos.getY() /* lat */ * (Math.PI / 180.0)); - if (e > 0.9999) { - e = 0.9999; - } - if (e < -0.9999) { - e = -0.9999; - } - double y = TileProviderUtils.getMapCenterInPixels(tileProvider, zoom).getY() - + 0.5 * Math.log((1 + e) / (1 - e)) * -1 * (getLongitudeRadianWidthInPixels(zoom)); - - return new Point2D.Double(x, y); - } - - /** - * @see PixelConverter#pixelToGeo(Point2D, int) - */ - @Override - public GeoPosition pixelToGeo(Point2D pixelCoordinate, int zoom) { - double wx = pixelCoordinate.getX(); - double wy = pixelCoordinate.getY(); - // this reverses getBitmapCoordinates - double flon = (wx - TileProviderUtils.getMapCenterInPixels(tileProvider, zoom).getX()) - / getLongitudeDegreeWidthInPixels(zoom); - double e1 = (wy - TileProviderUtils.getMapCenterInPixels(tileProvider, zoom).getY()) - / (-1 * getLongitudeRadianWidthInPixels(zoom)); - double e2 = (2 * Math.atan(Math.exp(e1)) - Math.PI / 2) / (Math.PI / 180.0); - double flat = e2; - GeoPosition wc = new GeoPosition(flon, flat, GeoPosition.WGS_84_EPSG); - return wc; - } - - /** - * @see PixelConverter#getMapEpsg() - */ - @Override - public int getMapEpsg() { - return GeoPosition.WGS_84_EPSG; - } - - /** - * @see PixelConverter#supportsBoundingBoxes() - */ - @Override - public boolean supportsBoundingBoxes() { - return false; - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/IllegalGeoPositionException.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/IllegalGeoPositionException.java deleted file mode 100644 index 9a23a7d5d2..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/IllegalGeoPositionException.java +++ /dev/null @@ -1,50 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -/** - * Exception that is thrown when a GeoPosition is not valid in the current - * context - * - * @author Simon Templer - */ -public class IllegalGeoPositionException extends Exception { - - private static final long serialVersionUID = 5290670443854010904L; - - /** - * @see Exception#Exception() - */ - public IllegalGeoPositionException() { - super(); - } - - /** - * @see Exception#Exception(String, Throwable) - */ - public IllegalGeoPositionException(String message, Throwable error) { - super(message, error); - } - - /** - * @see Exception#Exception(String) - */ - public IllegalGeoPositionException(String message) { - super(message); - } - - /** - * @see Exception#Exception(Throwable) - */ - public IllegalGeoPositionException(Throwable error) { - super(error); - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/JXMapKit.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/JXMapKit.java deleted file mode 100644 index 622cf3ff3f..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/JXMapKit.java +++ /dev/null @@ -1,560 +0,0 @@ -/* - * JXMapKit.java - * - * Created on November 19, 2006, 3:52 AM - */ - -package org.jdesktop.swingx.mapviewer; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.event.ActionEvent; -import java.awt.geom.Point2D; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.Icon; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JSlider; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXPanel; -import org.jdesktop.swingx.mapviewer.empty.EmptyTileFactory; -import org.jdesktop.swingx.painter.Painter; - -/** - *

- * The JXMapKit is a pair of JXMapViewers preconfigured to be easy to use with - * common features built in. This includes zoom buttons, a zoom slider, and a - * mini-map in the lower right corner showing an overview of the map. Each - * feature can be turned off using an appropriate isXvisible - * property. For example, to turn off the minimap call - * - * 

- * jxMapKit.setMiniMapVisible(false);
- *
- *

- * - *

- * The JXMapViewer is preconfigured to connect to maps.swinglabs.org which - * serves up global satellite imagery from NASA's - * Blue Marble - * NG image collection. - *

- * - * @author joshy - */ -public class JXMapKit extends JXPanel { - - private static final long serialVersionUID = -1096864144135804141L; - - private boolean miniMapVisible = true; - private boolean zoomSliderVisible = true; - private boolean zoomButtonsVisible = true; - private final boolean sliderReversed = false; - - // private boolean addressLocationShown = true; - - // private boolean dataProviderCreditShown = true; - - private static final Log log = LogFactory.getLog(JXMapKit.class); - - /** - * Creates a new JXMapKit - */ - public JXMapKit() { - initComponents(); - - zoomSlider.setOpaque(false); - try { - Icon minusIcon = new ImageIcon(JXMapKit.class.getResource("resources/minus.png")); - this.zoomOutButton.setIcon(minusIcon); - this.zoomOutButton.setText(""); - Icon plusIcon = new ImageIcon(JXMapKit.class.getResource("resources/plus.png")); - this.zoomInButton.setIcon(plusIcon); - this.zoomInButton.setText(""); - } catch (Throwable thr) { - System.out.println("error: " + thr.getMessage()); - thr.printStackTrace(); - } - - setTileFactory(new EmptyTileFactory()); - - mainMap.setCenterPosition(new GeoPosition(0, 0, GeoPosition.WGS_84_EPSG)); - miniMap.setCenterPosition(new GeoPosition(0, 0, GeoPosition.WGS_84_EPSG)); - mainMap.setRestrictOutsidePanning(true); - miniMap.setRestrictOutsidePanning(true); - - // update mini map center - mainMap.addPropertyChangeListener("center", new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - Point2D mapCenter = (Point2D) evt.getNewValue(); - TileFactory tf = mainMap.getTileFactory(); - GeoPosition mapPos = tf.getTileProvider().getConverter().pixelToGeo(mapCenter, - mainMap.getZoom()); - miniMap.setCenterPosition(mapPos); - } - }); - - // XXX centerPosition change means center change - /* - * mainMap.addPropertyChangeListener("centerPosition", new - * PropertyChangeListener() { public void - * propertyChange(PropertyChangeEvent evt) { mapCenterPosition = - * (GeoPosition)evt.getNewValue(); - * miniMap.setCenterPosition(mapCenterPosition); try { Point2D pt = - * miniMap.getTileFactory().getTileProvider().getConverter().geoToPixel( - * mapCenterPosition,miniMap.getZoom()); miniMap.setCenter(pt); - * miniMap.repaint(); } catch (IllegalGeoPositionException e) { - * log.warn("Error setting mini map center position", e); } } }); - */ - - // update mini map zoom - mainMap.addPropertyChangeListener("zoom", new PropertyChangeListener() { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - zoomSlider.setValue(mainMap.getZoom()); - miniMap.setZoom(Math.min(mainMap.getZoom() + 4, - mainMap.getTileFactory().getTileProvider().getMaximumZoom())); - } - }); - - // an overlay for the mini-map which shows a rectangle representing the - // main map - miniMap.setOverlayPainter(new Painter() { - - @Override - public void paint(Graphics2D g, JXMapViewer map, int width, int height) { - // get the viewport rect of the main map - Rectangle mainMapBounds = mainMap.getViewportBounds(); - - // convert to Point2Ds - Point2D upperLeft2D = mainMapBounds.getLocation(); - Point2D lowerRight2D = new Point2D.Double( - upperLeft2D.getX() + mainMapBounds.getWidth(), - upperLeft2D.getY() + mainMapBounds.getHeight()); - - // convert to GeoPostions - GeoPosition upperLeft = mainMap.getTileFactory().getTileProvider().getConverter() - .pixelToGeo(upperLeft2D, mainMap.getZoom()); - GeoPosition lowerRight = mainMap.getTileFactory().getTileProvider().getConverter() - .pixelToGeo(lowerRight2D, mainMap.getZoom()); - - // convert to Point2Ds on the mini-map - try { - upperLeft2D = map.getTileFactory().getTileProvider().getConverter() - .geoToPixel(upperLeft, map.getZoom()); - lowerRight2D = map.getTileFactory().getTileProvider().getConverter() - .geoToPixel(lowerRight, map.getZoom()); - - g = (Graphics2D) g.create(); - Rectangle rect = map.getViewportBounds(); - g.translate(-rect.x, -rect.y); - // Point2D centerpos = - // map.getTileFactory().getTileProvider().getConverter().geoToPixel(mapCenterPosition, - // map.getZoom()); - g.setPaint(Color.RED); - // g.drawRect((int)centerpos.getX()-30,(int)centerpos.getY()-30,60,60); - g.drawRect((int) upperLeft2D.getX(), (int) upperLeft2D.getY(), - (int) (lowerRight2D.getX() - upperLeft2D.getX()), - (int) (lowerRight2D.getY() - upperLeft2D.getY())); - g.setPaint(new Color(255, 0, 0, 50)); - g.fillRect((int) upperLeft2D.getX(), (int) upperLeft2D.getY(), - (int) (lowerRight2D.getX() - upperLeft2D.getX()), - (int) (lowerRight2D.getY() - upperLeft2D.getY())); - // g.drawOval((int)lowerRight2D.getX(),(int)lowerRight2D.getY(),1,1); - g.dispose(); - } catch (IllegalGeoPositionException e) { - log.warn("Error painting mini map overlay"); - } - } - }); - - setZoom(3);// joshy: hack, i shouldn't need this here - // this.setCenterPosition(new GeoPosition(0,0)); - } - - // private GeoPosition mapCenterPosition = new GeoPosition(0, 0, - // GeoPosition.WGS_84_EPSG); - - private boolean zoomChanging = false; - - /** - * Set the current zoomlevel for the main map. The minimap will be updated - * accordingly - * - * @param zoom the new zoom level - */ - public void setZoom(int zoom) { - zoomChanging = true; - mainMap.setZoom(zoom); - // XXX is done by property change listener - - // miniMap.setZoom(mainMap.getZoom()+4); - if (sliderReversed) { - zoomSlider.setValue(zoomSlider.getMaximum() - zoom); - } - else { - zoomSlider.setValue(zoom); - } - zoomChanging = false; - } - - /** - * Returns an action which can be attached to buttons or menu items to make - * the map zoom out - * - * @return a preconfigured Zoom Out action - */ - @SuppressWarnings("serial") - public Action getZoomOutAction() { - Action act = new AbstractAction() { - - @Override - public void actionPerformed(ActionEvent e) { - setZoom(mainMap.getZoom() - 1); - } - }; - act.putValue(Action.NAME, "-"); - return act; - } - - /** - * Returns an action which can be attached to buttons or menu items to make - * the map zoom in - * - * @return a preconfigured Zoom In action - */ - @SuppressWarnings("serial") - public Action getZoomInAction() { - Action act = new AbstractAction() { - - @Override - public void actionPerformed(ActionEvent e) { - setZoom(mainMap.getZoom() + 1); - } - }; - act.putValue(Action.NAME, "+"); - return act; - } - - /** - * This method is called from within the constructor to initialize the form. - * WARNING: Do NOT modify this code. The content of this method is always - * regenerated by the Form Editor. - */ - // //GEN-BEGIN:initComponents - private void initComponents() { - java.awt.GridBagConstraints gridBagConstraints; - - mainMap = new org.jdesktop.swingx.mapviewer.JXMapViewer(); - miniMap = new org.jdesktop.swingx.mapviewer.JXMapViewer(); - jPanel1 = new javax.swing.JPanel(); - zoomInButton = new javax.swing.JButton(); - zoomOutButton = new javax.swing.JButton(); - zoomSlider = new javax.swing.JSlider(); - - setLayout(new java.awt.GridBagLayout()); - - mainMap.setLayout(new java.awt.GridBagLayout()); - - miniMap.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(0, 0, 0))); - miniMap.setMinimumSize(new java.awt.Dimension(100, 100)); - miniMap.setPreferredSize(new java.awt.Dimension(100, 100)); - miniMap.setLayout(new java.awt.GridBagLayout()); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 0; - gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHEAST; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - mainMap.add(miniMap, gridBagConstraints); - - jPanel1.setOpaque(false); - jPanel1.setLayout(new java.awt.GridBagLayout()); - - zoomInButton.setAction(getZoomOutAction()); - zoomInButton.setIcon( - new javax.swing.ImageIcon(JXMapKit.class.getResource("resources/plus.png"))); - zoomInButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); - zoomInButton.setMaximumSize(new java.awt.Dimension(20, 20)); - zoomInButton.setMinimumSize(new java.awt.Dimension(20, 20)); - zoomInButton.setOpaque(false); - zoomInButton.setPreferredSize(new java.awt.Dimension(20, 20)); - zoomInButton.addActionListener(new java.awt.event.ActionListener() { - - @Override - public void actionPerformed(java.awt.event.ActionEvent evt) { - zoomInButtonActionPerformed(evt); - } - }); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 1; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHEAST; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - jPanel1.add(zoomInButton, gridBagConstraints); - - zoomOutButton.setAction(getZoomInAction()); - zoomOutButton.setIcon( - new javax.swing.ImageIcon(JXMapKit.class.getResource("resources/minus.png"))); - zoomOutButton.setMargin(new java.awt.Insets(2, 2, 2, 2)); - zoomOutButton.setMaximumSize(new java.awt.Dimension(20, 20)); - zoomOutButton.setMinimumSize(new java.awt.Dimension(20, 20)); - zoomOutButton.setOpaque(false); - zoomOutButton.setPreferredSize(new java.awt.Dimension(20, 20)); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 1; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.weighty = 1.0; - jPanel1.add(zoomOutButton, gridBagConstraints); - - zoomSlider.setMajorTickSpacing(1); - zoomSlider.setMaximum(15); - zoomSlider.setMinimum(10); - zoomSlider.setMinorTickSpacing(1); - zoomSlider.setOrientation(javax.swing.JSlider.VERTICAL); - zoomSlider.setPaintTicks(true); - zoomSlider.setSnapToTicks(true); - zoomSlider.setMinimumSize(new java.awt.Dimension(35, 100)); - zoomSlider.setPreferredSize(new java.awt.Dimension(35, 190)); - zoomSlider.addChangeListener(new javax.swing.event.ChangeListener() { - - @Override - public void stateChanged(javax.swing.event.ChangeEvent evt) { - zoomSliderStateChanged(evt); - } - }); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH; - jPanel1.add(zoomSlider, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHWEST; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - mainMap.add(jPanel1, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - add(mainMap, gridBagConstraints); - }// //GEN-END:initComponents - - private void zoomInButtonActionPerformed( - @SuppressWarnings("unused") java.awt.event.ActionEvent evt) {// GEN-FIRST:event_zoomInButtonActionPerformed - // TODO add your handling code here: - }// GEN-LAST:event_zoomInButtonActionPerformed - - private void zoomSliderStateChanged( - @SuppressWarnings("unused") javax.swing.event.ChangeEvent evt) {// GEN-FIRST:event_zoomSliderStateChanged - if (!zoomChanging) { - setZoom(zoomSlider.getValue()); - } - // TODO add your handling code here: - }// GEN-LAST:event_zoomSliderStateChanged - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JPanel jPanel1; - private org.jdesktop.swingx.mapviewer.JXMapViewer mainMap; - private org.jdesktop.swingx.mapviewer.JXMapViewer miniMap; - private javax.swing.JButton zoomInButton; - private javax.swing.JButton zoomOutButton; - private javax.swing.JSlider zoomSlider; - // End of variables declaration//GEN-END:variables - - /** - * Indicates if the mini-map is currently visible - * - * @return the current value of the mini-map property - */ - public boolean isMiniMapVisible() { - return miniMapVisible; - } - - /** - * Sets if the mini-map should be visible - * - * @param miniMapVisible a new value for the miniMap property - */ - public void setMiniMapVisible(boolean miniMapVisible) { - boolean old = this.isMiniMapVisible(); - this.miniMapVisible = miniMapVisible; - miniMap.setVisible(miniMapVisible); - firePropertyChange("miniMapVisible", old, this.isMiniMapVisible()); - } - - /** - * Indicates if the zoom slider is currently visible - * - * @return the current value of the zoomSliderVisible property - */ - public boolean isZoomSliderVisible() { - return zoomSliderVisible; - } - - /** - * Sets if the zoom slider should be visible - * - * @param zoomSliderVisible the new value of the zoomSliderVisible property - */ - public void setZoomSliderVisible(boolean zoomSliderVisible) { - boolean old = this.isZoomSliderVisible(); - this.zoomSliderVisible = zoomSliderVisible; - zoomSlider.setVisible(zoomSliderVisible); - firePropertyChange("zoomSliderVisible", old, this.isZoomSliderVisible()); - } - - /** - * Indicates if the zoom buttons are visible. This is a bound property and - * can be listed for using a PropertyChangeListener - * - * @return current value of the zoomButtonsVisible property - */ - public boolean isZoomButtonsVisible() { - return zoomButtonsVisible; - } - - /** - * Sets if the zoom buttons should be visible. This ia bound property. - * Changes can be listened for using a PropertyChaneListener - * - * @param zoomButtonsVisible new value of the zoomButtonsVisible property - */ - public void setZoomButtonsVisible(boolean zoomButtonsVisible) { - boolean old = this.isZoomButtonsVisible(); - this.zoomButtonsVisible = zoomButtonsVisible; - zoomInButton.setVisible(zoomButtonsVisible); - zoomOutButton.setVisible(zoomButtonsVisible); - firePropertyChange("zoomButtonsVisible", old, this.isZoomButtonsVisible()); - } - - /** - * Sets the tile factory for both embedded JXMapViewer components. Calling - * this method will also reset the center and zoom levels of both maps, as - * well as the bounds of the zoom slider. - * - * @param fact the new TileFactory - */ - public void setTileFactory(TileFactory fact) { - zoomChanging = true; - zoomSlider.setMinimum(fact.getTileProvider().getMinimumZoom()); - zoomSlider.setMaximum(fact.getTileProvider().getMaximumZoom()); - zoomChanging = false; - - mainMap.setTileFactory(fact); - // mainMap.setCenterPosition(TileProviderUtils.getMapCenter(fact.getTileProvider())); - mainMap.setZoom(fact.getTileProvider().getDefaultZoom()); - - miniMap.setTileFactory(fact); - // miniMap.setCenterPosition(TileProviderUtils.getMapCenter(fact.getTileProvider())); - - setZoom(fact.getTileProvider().getDefaultZoom()); - } - - /** - * Set the center position - * - * @param pos the center position to set - */ - public void setCenterPosition(GeoPosition pos) { - mainMap.setCenterPosition(pos); - // XXX is done by property change listener - - // miniMap.setCenterPosition(pos); - } - - /** - * Get the center position - * - * @return the center position - */ - public GeoPosition getCenterPosition() { - return mainMap.getCenterPosition(); - } - - /** - * Returns a reference to the main embedded JXMapViewer component - * - * @return the main map - */ - public JXMapViewer getMainMap() { - return this.mainMap; - } - - /** - * Returns a reference to the mini embedded JXMapViewer component - * - * @return the minimap JXMapViewer component - */ - public JXMapViewer getMiniMap() { - return this.miniMap; - } - - /** - * returns a reference to the zoom in button - * - * @return a jbutton - */ - public JButton getZoomInButton() { - return this.zoomInButton; - } - - /** - * returns a reference to the zoom out button - * - * @return a jbutton - */ - public JButton getZoomOutButton() { - return this.zoomOutButton; - } - - /** - * returns a reference to the zoom slider - * - * @return a jslider - */ - public JSlider getZoomSlider() { - return this.zoomSlider; - } - - /* - * public static void main(String ... args) { SwingUtilities.invokeLater(new - * Runnable() { public void run() { JXMapKit kit = new JXMapKit(); - * - * final int max = 17; TileFactoryInfo info = new - * TileFactoryInfo(1,max-2,max, 256, true, true, // tile size is 256 and x/y - * orientation is normal "http://tile.openstreetmap.org",//5/15/10.png", - * "x","y","z") { public String getTileUrl(int x, int y, int zoom) { zoom = - * max-zoom; String url = this.baseURL +"/"+zoom+"/"+x+"/"+y+".png"; return - * url; } - * - * }; TileFactory tf = new DefaultTileFactory(new - * TileFactoryInfoTileProvider(info, SimpleGeoConverter.INSTANCE)); - * kit.setTileFactory(tf); kit.setZoom(14); //kit.setAddressLocation(new - * GeoPosition(51.5,0)); kit.getMainMap().setDrawTileBorders(true); - * kit.getMainMap().setRestrictOutsidePanning(true); - * kit.getMainMap().setHorizontalWrapped(false); - * - * ((DefaultTileFactory)kit.getMainMap().getTileFactory()).setThreadPoolSize - * (8); JFrame frame = new JFrame("JXMapKit test"); frame.add(kit); - * frame.pack(); frame.setSize(500,300); frame.setVisible(true); } }); } - */ -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/JXMapViewer.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/JXMapViewer.java deleted file mode 100644 index b052abe14a..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/JXMapViewer.java +++ /dev/null @@ -1,1016 +0,0 @@ -/* - * MapViewer.java - * - * Created on March 14, 2006, 2:14 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer; - -import java.awt.Color; -import java.awt.Cursor; -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.Graphics2D; -import java.awt.Image; -import java.awt.Insets; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; -import java.awt.event.MouseWheelEvent; -import java.awt.event.MouseWheelListener; -import java.awt.geom.Point2D; -import java.awt.image.BufferedImage; -import java.beans.DesignMode; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; - -import javax.imageio.ImageIO; -import javax.swing.SwingUtilities; -import javax.swing.event.MouseInputListener; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jdesktop.swingx.JXPanel; -import org.jdesktop.swingx.mapviewer.empty.EmptyTileFactory; -import org.jdesktop.swingx.painter.AbstractPainter; -import org.jdesktop.swingx.painter.Painter; - -/** - * A tile oriented map component that can easily be used with tile sources on - * the web like Google and Yahoo maps, satellite data such as NASA imagery, and - * also with file based sources like pre-processed NASA images. - * - * @author Joshua.Marinacci@sun.com - */ -public class JXMapViewer extends JXPanel implements DesignMode { - - private static final Color UNLOADED_COLOR = Color.LIGHT_GRAY; - - private static final long serialVersionUID = -7093111390636710157L; - - private static final Log log = LogFactory.getLog(JXMapViewer.class); - - /** - * The zoom level. Generally a value between 1 and 15 (TODO Is this true for - * all the mapping worlds? What does this mean if some mapping system - * doesn't support the zoom level? - */ - private int zoom = 1; - - /** - * The position, in map coordinates of the center point. This is - * defined as the distance from the top and left edges of the map in pixels. - * Dragging the map component will change the center position. Zooming - * in/out will cause the center to be recalculated so as to remain in the - * center of the new "map". - */ - private Point2D center = new Point2D.Double(0, 0); - - /** - * Center position - */ - private GeoPosition centerPos = new GeoPosition(0, 0, GeoPosition.WGS_84_EPSG); - - /** - * Indicates whether or not to draw the borders between tiles. Defaults to - * false. - * - * TODO Generally not very nice looking, very much a product of testing - * Consider whether this should really be a property or not. - */ - private boolean drawTileBorders = false; - - /** - * Factory used by this component to grab the tiles necessary for painting - * the map. - */ - private transient TileFactory factory; - - /** - * The position in latitude/longitude of the "address" being mapped. This is - * a special coordinate that, when moved, will cause the map to be moved as - * well. It is separate from "center" in that "center" tracks the current - * center (in pixels) of the viewport whereas this will not change when - * panning or zooming. Whenever the addressLocation is changed, however, the - * map will be repositioned. - */ - // private GeoPosition addressLocation; - - /** - * Specifies whether panning is enabled. Panning is being able to click and - * drag the map around to cause it to move - */ - private boolean panEnabled = true; - - /** - * Specifies whether zooming is enabled (the mouse wheel, for example, - * zooms) - */ - private boolean zoomEnabled = true; - - /** - * Indicates whether the component should recenter the map when the "middle" - * mouse button is pressed - */ - private boolean recenterOnClickEnabled = true; - - /** - * The overlay to delegate to for painting the "foreground" of the map - * component. This would include painting waypoints, day/night, etc. Also - * receives mouse events. - */ - private Painter overlay; - - private boolean designTime; - - // private float zoomScale = 1; - - private Image loadingImage; - - private boolean restrictOutsidePanning = false; - private boolean horizontalWrapped = true; - - private final SortedSet tileOverlays = new TreeSet(); - - /** - * Create a new JXMapViewer. By default it will use the EmptyTileFactory - */ - public JXMapViewer() { - factory = new EmptyTileFactory(); - MouseInputListener mia = new PanMouseInputListener(); - setRecenterOnClickEnabled(false); - this.addMouseListener(mia); - this.addMouseMotionListener(mia); - this.addMouseWheelListener(new ZoomMouseWheelListener()); - this.addKeyListener(new PanKeyListener()); - - // make a dummy loading image - try { - URL url = JXMapViewer.class.getResource("resources/loading.png"); - this.setLoadingImage(ImageIO.read(url)); - } catch (Throwable ex) { - log.warn("could not load 'loading.png'"); - BufferedImage img = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB); - Graphics2D g2 = img.createGraphics(); - g2.setColor(Color.black); - g2.fillRect(0, 0, 16, 16); - g2.dispose(); - this.setLoadingImage(img); - } - - // setAddressLocation(new GeoPosition(37.392137,-121.950431)); // Sun - // campus - - setBackgroundPainter(new AbstractPainter() { - - @Override - protected void doPaint(Graphics2D g, JXPanel component, int width, int height) { - doPaintComponent(g); - } - }); - } - - // the method that does the actual painting - private void doPaintComponent( - Graphics g) {/* - * if (isOpaque() || isDesignTime()) { - * g.setColor(getBackground()); - * g.fillRect(0,0,getWidth(),getHeight()); } - */ - - if (isDesignTime()) { - // ? - } - else { - int zoom = getZoom(); - Rectangle viewportBounds = getViewportBounds(); - drawMapTiles(g, zoom, viewportBounds); - drawMapOverlay(g); - drawOverlays(zoom, g, viewportBounds); - } - - super.paintBorder(g); - } - - /** - * Indicate that the component is being used at design time, such as in a - * visual editor like NetBeans' Matisse - * - * @param b indicates if the component is being used at design time - */ - @Override - public void setDesignTime(boolean b) { - this.designTime = b; - } - - /** - * Indicates whether the component is being used at design time, such as in - * a visual editor like NetBeans' Matisse - * - * @return boolean indicating if the component is being used at design time - */ - @Override - public boolean isDesignTime() { - return designTime; - } - - /** - * Draw the map tiles. This method is for implementation use only. - * - * @param g Graphics - * @param zoom zoom level to draw at - * @param viewportBounds the bounds to draw within - */ - protected void drawMapTiles(final Graphics g, final int zoom, Rectangle viewportBounds) { - int tileWidth = getTileFactory().getTileProvider().getTileWidth(zoom); - int tileHeight = getTileFactory().getTileProvider().getTileHeight(zoom); - - // calculate the "visible" viewport area in tiles - int numWide = viewportBounds.width / tileWidth + 2; - int numHigh = viewportBounds.height / tileHeight + 2; - - int tpx = (int) Math.floor(viewportBounds.getX() / tileWidth); - int tpy = (int) Math.floor(viewportBounds.getY() / tileHeight); - - // fetch the tiles from the factory and store them in the tiles cache - // attach the tileLoadListener - for (int x = 0; x <= numWide; x++) { - for (int y = 0; y <= numHigh; y++) { - int itpx = x + tpx; - int itpy = y + tpy; - - // only proceed if the specified tile point lies within the area - // being painted - if (g.getClipBounds().intersects(new Rectangle(itpx * tileWidth - viewportBounds.x, - itpy * tileHeight - viewportBounds.y, tileWidth, tileHeight))) { - - int ox = ((itpx * tileWidth) - viewportBounds.x); - int oy = ((itpy * tileHeight) - viewportBounds.y); - - if (horizontalWrapped) { - int width = getTileFactory().getTileProvider().getMapWidthInTiles(zoom); - - // convert/wrap tile x coordinates - if (itpx < 0) - while (itpx < 0) - itpx += width; - else - itpx = itpx % width; - } - - // if the tile is off the map then just don't paint anything - if (!TileProviderUtils.isValidTile(getTileFactory().getTileProvider(), itpx, - itpy, zoom)) { - if (isOpaque()) { - g.setColor(getBackground()); - g.fillRect(ox, oy, tileWidth, tileHeight); - } - } - else { - Tile tile = getTileFactory().getTile(itpx, itpy, zoom); - tile.addUniquePropertyChangeListener("loaded", tileLoadListener); // this - // is - // a - // filthy - // hack - - if (tile.isLoaded()) { - g.drawImage(tile.getImage(), ox, oy, null); - } - else { - int imageX = (tileWidth - getLoadingImage().getWidth(null)) / 2; - int imageY = (tileHeight - getLoadingImage().getHeight(null)) / 2; - g.setColor(UNLOADED_COLOR); - g.fillRect(ox, oy, tileWidth, tileHeight); - g.drawImage(getLoadingImage(), ox + imageX, oy + imageY, null); - } - - drawTileOverlays(g, itpx, itpy, zoom, viewportBounds.x + ox, - viewportBounds.y + oy, ox, oy, tileWidth, tileHeight, - viewportBounds); - - if (isDrawTileBorders()) { - g.setColor(Color.black); - g.drawRect(ox, oy, tileWidth, tileHeight); - g.drawRect(ox + tileWidth / 2 - 5, oy + tileHeight / 2 - 5, 10, 10); - g.setColor(Color.white); - g.drawRect(ox + 1, oy + 1, tileWidth, tileHeight); - - String text = itpx + ", " + itpy + ", " + getZoom(); - g.setColor(Color.BLACK); - g.drawString(text, ox + 10, oy + 30); - g.drawString(text, ox + 10 + 2, oy + 30 + 2); - g.setColor(Color.WHITE); - g.drawString(text, ox + 10 + 1, oy + 30 + 1); - } - } - } - } - } - } - - private void drawTileOverlays(final Graphics g, final int tileX, final int tileY, - final int zoom, final int worldPixelX, final int worldPixelY, final int viewPixelX, - final int viewPixelY, final int tileWidth, final int tileHeight, - Rectangle viewportBounds) { - - g.translate(viewPixelX, viewPixelY); - - final PixelConverter converter = getTileFactory().getTileProvider().getConverter(); - - for (TileOverlayPainter overlay : tileOverlays) { - overlay.paintTile((Graphics2D) g, tileX, tileY, zoom, worldPixelX, worldPixelY, - tileWidth, tileHeight, converter, viewportBounds); - } - - g.translate(-viewPixelX, -viewPixelY); - } - - @SuppressWarnings("unused") - private void drawOverlays(final int zoom, final Graphics g, final Rectangle viewportBounds) { - if (overlay != null) { - overlay.paint((Graphics2D) g, this, getWidth(), getHeight()); - } - } - - private void drawMapOverlay(final Graphics g) { - Painter painter = factory.getTileProvider().getMapOverlayPainter(); - if (painter != null) { - painter.paint((Graphics2D) g, this, getWidth(), getHeight()); - } - } - - /** - * Sets the map overlay. This is a Painter which will paint on top of the - * map. It can be used to draw waypoints, lines, or static overlays like - * text messages. - * - * @param overlay the map overlay to use - * @see Painter - */ - public void setOverlayPainter(Painter overlay) { - Painter old = getOverlayPainter(); - this.overlay = overlay; - firePropertyChange("mapOverlay", old, getOverlayPainter()); - repaint(); - } - - /** - * Gets the current map overlay - * - * @return the current map overlay - */ - public Painter getOverlayPainter() { - return overlay; - } - - /** - * @return the tileOverlays - */ - public SortedSet getTileOverlays() { - return tileOverlays; - } - - /** - * @param tileOverlays the tileOverlays to set - */ - public void setTileOverlays(SortedSet tileOverlays) { - synchronized (tileOverlays) { - this.tileOverlays.clear(); - this.tileOverlays.addAll(tileOverlays); - } - - for (TileOverlayPainter overlay : tileOverlays) { - overlay.setTileProvider(factory.getTileProvider()); - } - - repaint(); - } - - /** - * Add a tile overlay painter - * - * @param overlay the tile overlay painter - */ - public void addTileOverlay(TileOverlayPainter overlay) { - synchronized (tileOverlays) { - tileOverlays.add(overlay); - } - - overlay.setTileProvider(factory.getTileProvider()); - - repaint(); - } - - /** - * Remove a tile overlay painter - * - * @param overlay the tile overlay painter - */ - public void removeTileOverlay(TileOverlayPainter overlay) { - synchronized (tileOverlays) { - tileOverlays.remove(overlay); - } - - repaint(); - } - - /** - * Returns the bounds of the viewport in pixels. This can be used to - * transform points into the world bitmap coordinate space. - * - * @return the bounds in pixels of the "view" of this map - */ - public Rectangle getViewportBounds() { - return calculateViewportBounds(getCenter()); - } - - private Rectangle calculateViewportBounds(Point2D center) { - Insets insets = getInsets(); - // calculate the "visible" viewport area in pixels - int viewportWidth = getWidth() - insets.left - insets.right; - int viewportHeight = getHeight() - insets.top - insets.bottom; - double viewportX = (center.getX() - viewportWidth / 2); - double viewportY = (center.getY() - viewportHeight / 2); - return new Rectangle((int) viewportX, (int) viewportY, viewportWidth, viewportHeight); - } - - /** - * Sets whether the map should recenter itself on mouse clicks (middle mouse - * clicks?) - * - * @param b if should recenter - */ - public void setRecenterOnClickEnabled(boolean b) { - boolean old = isRecenterOnClickEnabled(); - recenterOnClickEnabled = b; - firePropertyChange("recenterOnClickEnabled", old, isRecenterOnClickEnabled()); - } - - /** - * Indicates if the map should recenter itself on mouse clicks. - * - * @return boolean indicating if the map should recenter itself - */ - public boolean isRecenterOnClickEnabled() { - return recenterOnClickEnabled; - } - - /** - * Set the current zoom level - * - * @param zoom the new zoom level - */ - public void setZoom(int zoom) { - if (zoom == this.zoom) { - return; - } - - TileProvider info = getTileFactory().getTileProvider(); - // don't repaint if we are out of the valid zoom levels - if (info != null && (zoom < info.getMinimumZoom() || zoom > info.getMaximumZoom())) { - return; - } - - int oldzoom = this.zoom; - this.zoom = zoom; - this.firePropertyChange("zoom", oldzoom, zoom); - - recenter(); - - repaint(); - } - - /** - * Recenter on the {@link GeoPosition} set by - * {@link #setCenterPosition(GeoPosition)} - */ - private void recenter() { - try { - Point2D center = getTileFactory().getTileProvider().getConverter().geoToPixel(centerPos, - zoom); - updateCenter(center); - } catch (IllegalGeoPositionException e) { - // log.warn("Error recentering map on center position, centering on - // map center instead", e); - log.info("Error recentering map on center position, centering on map center instead"); - try { - centerOnPixel(TileProviderUtils - .getMapCenterInPixels(getTileFactory().getTileProvider(), zoom)); - } catch (Exception e2) { - // ignore - } - } - } - - /** - * Sets the center position to the given pixel coordinates - * - * @param point the pixel coordinates - * - * @see #setCenterPosition(GeoPosition) - */ - public void centerOnPixel(Point2D point) { - GeoPosition pos = getTileFactory().getTileProvider().getConverter().pixelToGeo(point, - getZoom()); - - setCenterPosition(pos); - } - - /** - * Gets the current zoom level - * - * @return the current zoom level - */ - public int getZoom() { - return this.zoom; - } - - /** - * Indicates if the tile borders should be drawn. Mainly used for debugging. - * - * @return the value of this property - */ - public boolean isDrawTileBorders() { - return drawTileBorders; - } - - /** - * Set if the tile borders should be drawn. Mainly used for debugging. - * - * @param drawTileBorders new value of this drawTileBorders - */ - public void setDrawTileBorders(boolean drawTileBorders) { - boolean old = isDrawTileBorders(); - this.drawTileBorders = drawTileBorders; - firePropertyChange("drawTileBorders", old, isDrawTileBorders()); - repaint(); - } - - /** - * A property indicating if the map should be pannable by the user using the - * mouse. - * - * @return property value - */ - public boolean isPanEnabled() { - return panEnabled; - } - - /** - * A property indicating if the map should be pannable by the user using the - * mouse. - * - * @param panEnabled new property value - */ - public void setPanEnabled(boolean panEnabled) { - boolean old = isPanEnabled(); - this.panEnabled = panEnabled; - firePropertyChange("panEnabled", old, isPanEnabled()); - } - - /** - * A property indicating if the map should be zoomable by the user using the - * mouse wheel. - * - * @return the current property value - */ - public boolean isZoomEnabled() { - return zoomEnabled; - } - - /** - * A property indicating if the map should be zoomable by the user using the - * mouse wheel. - * - * @param zoomEnabled the new value of the property - */ - public void setZoomEnabled(boolean zoomEnabled) { - boolean old = isZoomEnabled(); - this.zoomEnabled = zoomEnabled; - firePropertyChange("zoomEnabled", old, isZoomEnabled()); - } - - /** - * A property indicating the center position of the map - * - * @param geoPosition the new property value - */ - public void setCenterPosition(GeoPosition geoPosition) { - GeoPosition oldVal = getCenterPosition(); - this.centerPos = geoPosition; - recenter(); - repaint(); - GeoPosition newVal = getCenterPosition(); - firePropertyChange("centerPosition", oldVal, newVal); - } - - /** - * A property indicating the center position of the map - * - * @return the current center position - */ - public GeoPosition getCenterPosition() { - return centerPos; - } - - /** - * Get the current factory - * - * @return the current property value - */ - public TileFactory getTileFactory() { - return factory; - } - - /** - * Set the current tile factory - * - * @param factory the new property value - */ - public void setTileFactory(TileFactory factory) { - this.factory = factory; - - setHorizontalWrapped(factory.getTileProvider().getAllowHorizontalWrapping()); - setDrawTileBorders(factory.getTileProvider().getDrawTileBorders()); - - // setZoom(factory.getTileProvider().getDefaultZoom()); - - for (TileOverlayPainter overlay : tileOverlays) { - overlay.setTileProvider(factory.getTileProvider()); - } - } - - /** - * A property for an image which will be display when an image is still - * loading. - * - * @return the current property value - */ - public Image getLoadingImage() { - return loadingImage; - } - - /** - * A property for an image which will be display when an image is still - * loading. - * - * @param loadingImage the new property value - */ - public void setLoadingImage(Image loadingImage) { - this.loadingImage = loadingImage; - } - - /** - * Gets the current pixel center of the map. This point is in the global - * bitmap coordinate system, not as lat/longs. - * - * @return the current center of the map as a pixel value - */ - public Point2D getCenter() { - return center; - } - - /** - * Sets the new center of the map in pixel coordinates. - * - * Utility function! Should only be called by recenter - * - * @param center the new center of the map in pixel coordinates - */ - private void updateCenter(Point2D center) { - Point2D old = this.getCenter(); - - if (isRestrictOutsidePanning()) { - Insets insets = getInsets(); - int viewportHeight = getHeight() - insets.top - insets.bottom; - int viewportWidth = getWidth() - insets.left - insets.right; - - // don't let the user pan over the top edge - Rectangle newVP = calculateViewportBounds(center); - if (newVP.getY() < 0) { - double centerY = viewportHeight / 2; - center = new Point2D.Double(center.getX(), centerY); - } - - // don't let the user pan over the left edge - if (!isHorizontalWrapped() && newVP.getX() < 0) { - double centerX = viewportWidth / 2; - center = new Point2D.Double(centerX, center.getY()); - } - - // don't let the user pan over the bottom edge - Dimension mapSize = TileProviderUtils.getMapSize(getTileFactory().getTileProvider(), - getZoom()); - int mapHeight = (int) mapSize.getHeight() - * getTileFactory().getTileProvider().getTileHeight(getZoom()); - if (newVP.getY() + newVP.getHeight() > mapHeight) { - double centerY = mapHeight - viewportHeight / 2; - center = new Point2D.Double(center.getX(), centerY); - } - - // don't let the user pan over the right edge - int mapWidth = (int) mapSize.getWidth() - * getTileFactory().getTileProvider().getTileWidth(getZoom()); - if (!isHorizontalWrapped() && (newVP.getX() + newVP.getWidth() > mapWidth)) { - double centerX = mapWidth - viewportWidth / 2; - center = new Point2D.Double(centerX, center.getY()); - } - - // if map is to small then just center it vert - if (mapHeight < newVP.getHeight()) { - double centerY = mapHeight / 2;// viewportHeight/2;// - - // mapHeight/2; - center = new Point2D.Double(center.getX(), centerY); - } - - // if map is too small then just center it horiz - if (!isHorizontalWrapped() && mapWidth < newVP.getWidth()) { - double centerX = mapWidth / 2; - center = new Point2D.Double(centerX, center.getY()); - } - } - - // joshy: this is an evil hack to force a property change event - // i don't know why it doesn't work normally - old = new Point(5, 6); - - this.center = center; - firePropertyChange("center", old, this.center); - repaint(); - } - - // a property change listener which forces repaints when tiles finish - // loading - private transient TileLoadListener tileLoadListener = new TileLoadListener(); - - private final class TileLoadListener implements PropertyChangeListener { - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if ("loaded".equals(evt.getPropertyName()) && Boolean.TRUE.equals(evt.getNewValue())) { - TileInfo t = (TileInfo) evt.getSource(); - if (t.getZoom() == getZoom()) { - repaint(); - /* - * this optimization doesn't save much and it doesn't work - * if you wrap around the world Rectangle viewportBounds = - * getViewportBounds(); TilePoint tilePoint = - * t.getLocation(); Point point = new Point(tilePoint.getX() - * * getTileFactory().getTileSize(), tilePoint.getY() * - * getTileFactory().getTileSize()); Rectangle tileRect = new - * Rectangle(point, new - * Dimension(getTileFactory().getTileSize(), - * getTileFactory().getTileSize())); if - * (viewportBounds.intersects(tileRect)) { //convert - * tileRect from world space to viewport space repaint(new - * Rectangle( tileRect.x - viewportBounds.x, tileRect.y - - * viewportBounds.y, tileRect.width, tileRect.height )); } - */ - } - } - } - } - - // used to pan using the arrow keys - private class PanKeyListener extends KeyAdapter { - - private static final int OFFSET = 10; - - @Override - public void keyPressed(KeyEvent e) { - int delta_x = 0; - int delta_y = 0; - - switch (e.getKeyCode()) { - case KeyEvent.VK_LEFT: - delta_x = -OFFSET; - break; - case KeyEvent.VK_RIGHT: - delta_x = OFFSET; - break; - case KeyEvent.VK_UP: - delta_y = -OFFSET; - break; - case KeyEvent.VK_DOWN: - delta_y = OFFSET; - break; - } - - if (delta_x != 0 || delta_y != 0) { - Rectangle bounds = getViewportBounds(); - double x = bounds.getCenterX() + delta_x; - double y = bounds.getCenterY() + delta_y; - centerOnPixel(new Point2D.Double(x, y)); - repaint(); - } - } - } - - // used to pan using press and drag mouse gestures - private class PanMouseInputListener implements MouseInputListener { - - Point prev; - - @Override - public void mousePressed(MouseEvent evt) { - // if the middle mouse button is clicked, recenter the view - if (isRecenterOnClickEnabled() && (SwingUtilities.isMiddleMouseButton(evt) - || (SwingUtilities.isLeftMouseButton(evt) && evt.getClickCount() == 2))) { - recenterMap(evt); - } - else { - // otherwise, just remember this point (for panning) - prev = evt.getPoint(); - } - } - - private void recenterMap(MouseEvent evt) { - Rectangle bounds = getViewportBounds(); - double x = bounds.getX() + evt.getX(); - double y = bounds.getY() + evt.getY(); - centerOnPixel(new Point2D.Double(x, y)); - repaint(); - } - - @Override - public void mouseDragged(MouseEvent evt) { - if (isPanEnabled()) { - try { - Point current = evt.getPoint(); - double x = getCenter().getX() - (current.x - prev.x); - double y = getCenter().getY() - (current.y - prev.y); - - if (y < 0) { - y = 0; - } - - int maxHeight = getTileFactory().getTileProvider() - .getMapHeightInTiles(getZoom()) - * getTileFactory().getTileProvider().getTileHeight(getZoom()); - if (y > maxHeight) { - y = maxHeight; - } - - prev = current; - centerOnPixel(new Point2D.Double(x, y)); - repaint(); - setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); - } catch (Exception e) { - // ignore - } - } - } - - @Override - public void mouseReleased(MouseEvent evt) { - prev = null; - setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); - } - - @Override - public void mouseMoved(MouseEvent e) { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - requestFocusInWindow(); - } - }); - } - - @Override - public void mouseClicked(MouseEvent e) { - // override me - } - - @Override - public void mouseEntered(MouseEvent e) { - // override me - } - - @Override - public void mouseExited(MouseEvent e) { - // override me - } - } - - // zooms using the mouse wheel - private class ZoomMouseWheelListener implements MouseWheelListener { - - @Override - public void mouseWheelMoved(MouseWheelEvent e) { - if (isZoomEnabled()) { - setZoom(getZoom() + e.getWheelRotation()); - } - } - } - - /** - * Get if outside panning shall be restricted - * - * @return if outside panning shall be restricted - */ - public boolean isRestrictOutsidePanning() { - return restrictOutsidePanning; - } - - /** - * Set if outside panning shall be restricted - * - * @param restrictOutsidePanning if outside panning shall be restricted - */ - public void setRestrictOutsidePanning(boolean restrictOutsidePanning) { - this.restrictOutsidePanning = restrictOutsidePanning; - } - - /** - * Set if the map shall be horizontally wrapped - * - * @return if the map shall be horizontally wrapped - */ - public boolean isHorizontalWrapped() { - return horizontalWrapped; - } - - /** - * Set if the map shall be horizontally wrapped - * - * @param horizontalWrapped if the map shall be horizontally wrapped - */ - public void setHorizontalWrapped(boolean horizontalWrapped) { - this.horizontalWrapped = horizontalWrapped; - } - - /** - * Converts the specified GeoPosition to a point in the JXMapViewer's local - * coordinate space. This method is especially useful when drawing lat/long - * positions on the map. - * - * @param pos a GeoPosition on the map - * @return the point in the local coordinate space of the map - * @throws IllegalGeoPositionException if converting the position fails - */ - public Point2D convertGeoPositionToPoint(GeoPosition pos) throws IllegalGeoPositionException { - // convert from geo to world bitmap - Point2D pt = getTileFactory().getTileProvider().getConverter().geoToPixel(pos, getZoom()); - // convert from world bitmap to local - Rectangle bounds = getViewportBounds(); - return new Point2D.Double(pt.getX() - bounds.getX(), pt.getY() - bounds.getY()); - } - - /** - * Converts the specified Point2D in the JXMapViewer's local coordinate - * space to a GeoPosition on the map. This method is especially useful for - * determining the GeoPosition under the mouse cursor. - * - * @param pt a point in the local coordinate space of the map - * @return the point converted to a GeoPosition - */ - public GeoPosition convertPointToGeoPosition(Point2D pt) { - // convert from local to world bitmap - Rectangle bounds = getViewportBounds(); - Point2D pt2 = new Point2D.Double(pt.getX() + bounds.getX(), pt.getY() + bounds.getY()); - - // convert from world bitmap to geo - GeoPosition pos = getTileFactory().getTileProvider().getConverter().pixelToGeo(pt2, - getZoom()); - return pos; - } - - /** - * Converts a {@link List} of {@link Point2D} to a {@link List} of - * {@link GeoPosition}. - * - * @see JXMapViewer#convertPointToGeoPosition(Point2D) - * @param pts points to be converted - * - * @return {@link List} of {@link GeoPosition} - */ - public List convertAllPointsToGeoPositions(List pts) { - List pos = new ArrayList(pts.size()); - - Rectangle bounds = getViewportBounds(); - int zoom = getZoom(); - - for (Point2D pt : pts) { - // convert from local to world bitmap - pt.setLocation(pt.getX() + bounds.getX(), pt.getY() + bounds.getY()); - - // convert from world bitmap to geo - pos.add(getTileFactory().getTileProvider().getConverter().pixelToGeo(pt, zoom)); - } - - return pos; - } -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/JXMapViewerApplet.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/JXMapViewerApplet.java deleted file mode 100644 index 711f81ad77..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/JXMapViewerApplet.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * JXMapViewerApplet.java - * - * Created on December 19, 2006, 11:51 AM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer; - -import java.util.HashSet; -import java.util.Set; -import javax.swing.JApplet; - -/** - * - * @author joshy - */ -public class JXMapViewerApplet extends JApplet { - - private static final long serialVersionUID = 8488941248384896693L; - - /** - * The map kit - */ - protected JXMapKit kit; - - /** Creates a new instance of JXMapViewerApplet */ - public JXMapViewerApplet() { - } - - /** - * @see JApplet#init() - */ - @Override - public void init() { - try { - javax.swing.SwingUtilities.invokeAndWait(new Runnable() { - - @Override - public void run() { - createGUI(); - } - }); - } catch (Exception e) { - System.err.println("createGUI didn't successfully complete"); - e.printStackTrace(); - } - } - - /** - * Create the UI - */ - protected void createGUI() { - kit = new JXMapKit(); - // GeoPosition origin = new GeoPosition(0, 0, GeoPosition.WGS_84_EPSG); - GeoPosition sanjose = new GeoPosition(37, 20, 0, -121, -53, 0); - GeoPosition statlib = new GeoPosition(40, 41, 20, -74, -2, -42.4); - Set set = new HashSet(); - set.add(new Waypoint(statlib)); - set.add(new Waypoint(sanjose)); - WaypointPainter wp = new WaypointPainter(); - wp.setWaypoints(set); - kit.getMainMap().setOverlayPainter(wp); - kit.getMainMap().setCenterPosition(new GeoPosition(-100, 38.5, GeoPosition.WGS_84_EPSG)); - kit.setZoom(2); - this.add(kit); - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/PixelConverter.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/PixelConverter.java deleted file mode 100644 index fdf50cd761..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/PixelConverter.java +++ /dev/null @@ -1,59 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -import java.awt.geom.Point2D; - -/** - * GeoConverter - * - * @author Simon Templer - */ -public interface PixelConverter { - - /** - * Convert a pixel in the world bitmap at the specified zoom level into a - * GeoPosition - * - * @param pixelCoordinate a Point2D representing a pixel in the world bitmap - * @param zoom the zoom level of the world bitmap - * @return the converted GeoPosition - */ - public GeoPosition pixelToGeo(Point2D pixelCoordinate, int zoom); - - /** - * Convert a GeoPosition to a pixel position in the world bitmap a the - * specified zoom level. - * - * @param pos a GeoPosition - * @param zoom the zoom level to extract the pixel coordinate for - * @return the pixel point - * - * @throws IllegalGeoPositionException if pos is not inside the map's bounds - * or if it cannot be converted to the map's coordinate - * reference system - */ - public Point2D geoToPixel(GeoPosition pos, int zoom) throws IllegalGeoPositionException; - - /** - * Get the EPSG code of the map SRS - * - * @return the EPSG code - */ - public int getMapEpsg(); - - /** - * Get if non-overlapping bounding boxes are supported - * - * @return if non-overlapping bounding boxes are supported - */ - public boolean supportsBoundingBoxes(); - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/Tile.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/Tile.java deleted file mode 100644 index 7761a1a639..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/Tile.java +++ /dev/null @@ -1,326 +0,0 @@ -/* - * Tile.java - * - * Created on March 14, 2006, 4:53 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer; - -import java.awt.EventQueue; -import java.awt.image.BufferedImage; -import java.beans.PropertyChangeListener; -import java.lang.ref.SoftReference; -import java.net.URI; -import java.util.Random; - -import javax.swing.SwingUtilities; - -import org.jdesktop.beans.AbstractBean; - -/** - * The Tile class represents a particular square image piece of the world bitmap - * at a particular zoom level. - * - * @author joshy - * @author Simon Templer - * - * @version $Id$ - */ - -public class Tile extends AbstractBean implements TileInfo { - - /** - * Priority enumeration - */ - public enum Priority { - /** High priority */ - High, /** Low priority */ - Low - } - - private Priority priority = Priority.High; - - // private static final Log log = LogFactory.getLog(Tile.class); - - private boolean isLoading = false; - - private TileFactory tileFactory; - - /** - * If an error occurs while loading a tile, store the exception here. - */ - private Throwable error; - - /** - * The url of the image to load for this tile and its alternatives - */ - private URI[] uris; - - /** - * The index of the URI in {@link #uris} that should be returned when - * {@link #getURI()} is called. Will be increased every time, - * {@link #notifyBeforeRetry()} is called. - */ - private int currentURI = 0; - - /** - * Indicates that loading has succeeded. A PropertyChangeEvent will be fired - * when the loading is completed - */ - private boolean loaded = false; - - /** - * The tile coordinates and zoom level - */ - private final int zoom, x, y; - - /** - * The image loaded for this Tile - */ - SoftReference image = new SoftReference(null); - - /** - * Create a new Tile at the specified tile point and zoom level - * - * @param x the x coordinate - * @param y the y coordinate - * @param zoom the zoom level - */ - public Tile(int x, int y, int zoom) { - loaded = false; - this.zoom = zoom; - this.x = x; - this.y = y; - } - - /** - * Create a new Tile that loads its data from the given URI. The URI must - * resolve to an image - * - * @param x the tile x ordinate - * @param y the tile y ordinate - * @param zoom the tile's zoom level - * @param uris the tile image URI (and its alternatives) - * @param priority the priority - * @param tileFactory the tile factory - */ - Tile(int x, int y, int zoom, Priority priority, TileFactory tileFactory, URI... uris) { - this.uris = uris; - if (uris != null) { - currentURI = new Random().nextInt(uris.length); - } - loaded = false; - this.zoom = zoom; - this.x = x; - this.y = y; - this.priority = priority; - this.tileFactory = tileFactory; - // startLoading(); - } - - /** - * - * Indicates if this tile's underlying image has been successfully loaded - * yet. - * - * @return true if the Tile has been loaded - */ - public synchronized boolean isLoaded() { - return loaded; - } - - /** - * Toggles the loaded state, and fires the appropriate property change - * notification - * - * @param loaded the loaded state to set - */ - synchronized void setLoaded(boolean loaded) { - boolean old = isLoaded(); - this.loaded = loaded; - firePropertyChange("loaded", old, isLoaded()); - } - - /** - * Returns the last error in a possible chain of errors that occurred during - * the loading of the tile - * - * @return the last error that occurred while loading the tile - */ - public Throwable getUnrecoverableError() { - return error; - } - - /** - * Returns the {@link Throwable} tied to any error that may have ocurred - * while loading the tile. This error may change several times if multiple - * errors occur - * - * @return the error that occurred while loading the tile - */ - public Throwable getLoadingError() { - return error; - } - - /** - * Returns the Image associated with this Tile. This is a read only property - * This may return null at any time, however if this returns null, a load - * operation will automatically be started for it. - * - * @return the tile image - */ - public BufferedImage getImage() { - BufferedImage img = image.get(); - if (img == null) { - setLoaded(false); - tileFactory.startLoading(this); - } - - return img; - } - - /** - * @see org.jdesktop.swingx.mapviewer.TileInfo#getZoom() - */ - @Override - public int getZoom() { - return zoom; - } - - ////////////////// JavaOne Hack/////////////////// - private PropertyChangeListener uniqueListener = null; - - /** - * Adds a single property change listener. If a listener has been previously - * added then it will be replaced by the new one. - * - * @param propertyName - * @param listener - */ - @SuppressWarnings("javadoc") - public void addUniquePropertyChangeListener(String propertyName, - PropertyChangeListener listener) { - if (uniqueListener != null && uniqueListener != listener) { - removePropertyChangeListener(propertyName, uniqueListener); - } - if (uniqueListener != listener) { - uniqueListener = listener; - addPropertyChangeListener(propertyName, uniqueListener); - } - } - - ///////////////// End JavaOne Hack///////////////// - - /** - * Fire a property change on the event dispatch thread - * - * @param propertyName the property name - * @param oldValue the old property value - * @param newValue the new property value - */ - void firePropertyChangeOnEDT(final String propertyName, final Object oldValue, - final Object newValue) { - if (!EventQueue.isDispatchThread()) { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - firePropertyChange(propertyName, oldValue, newValue); - } - }); - } - } - - /** - * @return the error - */ - public Throwable getError() { - return error; - } - - /** - * @param error the error to set - */ - public void setError(Throwable error) { - this.error = error; - } - - /** - * @return the isLoading - */ - public boolean isLoading() { - return isLoading; - } - - /** - * @param isLoading the isLoading to set - */ - public void setLoading(boolean isLoading) { - this.isLoading = isLoading; - } - - /** - * Gets the loading priority of this tile. - * - * @return the tile's priority - */ - public Priority getPriority() { - return priority; - } - - /** - * Set the loading priority of this tile. - * - * @param priority the priority to set - */ - public void setPriority(Priority priority) { - this.priority = priority; - } - - /** - * @see org.jdesktop.swingx.mapviewer.TileInfo#getURI() - */ - @Override - public URI getURI() { - if (uris == null) { - return null; - } - return uris[currentURI]; - } - - @Override - public URI getIdentifier() { - if (uris == null) { - return null; - } - return uris[0]; - } - - /** - * @see org.jdesktop.swingx.mapviewer.TileInfo#getX() - */ - @Override - public int getX() { - return x; - } - - /** - * @see org.jdesktop.swingx.mapviewer.TileInfo#getY() - */ - @Override - public int getY() { - return y; - } - - /** - * Notifies the tile that the tile runner is about to retry loading it. - */ - public void notifyBeforeRetry() { - if (uris != null) { - currentURI = (currentURI + 1) % uris.length; - } - } -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileCache.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileCache.java deleted file mode 100644 index b4a87e9d7e..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileCache.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.jdesktop.swingx.mapviewer; - -import java.awt.image.BufferedImage; -import java.io.IOException; - -/** - * Tile cache interface. - * - * @author Simon Templer - */ -public interface TileCache { - - /** - * Returns a buffered image for the requested URI from the cache. This - * method must return null if the image is not in the cache. If the image is - * unavailable but it's compressed version *is* available, then the - * compressed version will be expanded and returned. - * - * @param tile the tile info - * @return the image matching the requested URI, or null if not available - * @throws java.io.IOException - */ - @SuppressWarnings("javadoc") - public abstract BufferedImage get(TileInfo tile) throws IOException; - - /** - * Request that the cache free up some memory. How this happens or how much - * memory is freed is up to the TileCache implementation. Subclasses can - * implement their own strategy. The default strategy is to clear out all - * buffered images but retain the compressed versions. - */ - public abstract void clear(); - -} \ No newline at end of file diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileFactory.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileFactory.java deleted file mode 100644 index 8f7b49801f..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileFactory.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * TileFactory.java - * - * Created on March 17, 2006, 8:01 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer; - -/** - * A class that can produce tiles and convert coordinates to pixels - * - * @author joshy - * @author Simon Templer - * - * @version $Id$ - */ -public interface TileFactory { - - /** - * Gets the TileProvider of the TileFactory - * - * @return the TileProvider - */ - public abstract TileProvider getTileProvider(); - - /** - * - * Return the Tile at a given TilePoint and zoom level - * - * @return the tile that is located at the given tilePoint for this zoom - * level. For example, if getMapSize() returns 10x20 for this zoom, - * and the tilePoint is (3,5), then the appropriate tile will be - * located and returned. This method must not return null. However, - * it can return dummy tiles that contain no data if it wants. This - * is appropriate, for example, for tiles which are outside of the - * bounds of the map and if the factory doesn't implement wrapping. - * - * @param x the tile's x coordinate - * @param y the tile's y coordinate - * @param zoom the current zoom level - */ - public abstract Tile getTile(int x, int y, int zoom); - - /** - * Start loading the given tile - * - * @param tile the tile to load - */ - public abstract void startLoading(Tile tile); - - /** - * Stops the worker threads and frees the tile cache - */ - public abstract void cleanup(); - - /** - * Clears the tile cache - */ - public abstract void clearCache(); - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileFactoryInfo.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileFactoryInfo.java deleted file mode 100644 index 7e62d6bbdd..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileFactoryInfo.java +++ /dev/null @@ -1,380 +0,0 @@ -/* - * TileFactoryInfo.java - * - * Created on June 26, 2006, 10:47 AM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer; - -import java.awt.geom.Point2D; - -/** - * A TileFactoryInfo encapsulates all information specific to a map server. This - * includes everything from the url to load the map tiles from to the size and - * depth of the tiles. Theoretically any map server can be used by installing a - * customized TileFactoryInfo. Currently - * - * @author joshy - */ -@Deprecated -public class TileFactoryInfo { - - private final int minimumZoomLevel; - private final int maximumZoomLevel; - private final int totalMapZoom; - // the size of each tile (assumes they are square) - private int tileSize = 256; - - /* - * The number of tiles wide at each zoom level - */ - private final int[] mapWidthInTilesAtZoom; - /** - * An array of coordinates in pixels that indicates the center in - * the world map for the given zoom level. - */ - private final Point2D[] mapCenterInPixelsAtZoom;// = new Point2D.Double[18]; - - /** - * An array of doubles that contain the number of pixels per degree of - * longitude at a give zoom level. - */ - private final double[] longitudeDegreeWidthInPixels; - - /** - * An array of doubles that contain the number of radians per degree of - * longitude at a given zoom level (where longitudeRadianWidthInPixels[0] is - * the most zoomed out) - */ - private final double[] longitudeRadianWidthInPixels; - - /** - * The base url for loading tiles from (and its alternatives). - */ - protected String[] baseURLs; - private final String xparam; - private final String yparam; - private final String zparam; - private boolean xr2l = true; - private boolean yt2b = true; - - private int defaultZoomLevel; - - /** A name for this info. */ - private final String name; - - /** - * Creates a new instance of TileFactoryInfo. Note that TileFactoryInfo - * should be considered invariate, meaning that subclasses should ensure all - * of the properties stay the same after the class is constructed. Returning - * different values of getTileSize() for example is considered an error and - * may result in unexpected behavior. - * - * @param minimumZoomLevel The minimum zoom level - * @param maximumZoomLevel the maximum zoom level - * @param totalMapZoom the top zoom level, essentially the height of the - * pyramid - * @param tileSize the size of the tiles in pixels (must be square) - * @param xr2l if the x goes r to l (is this backwards?) - * @param yt2b if the y goes top to bottom - * @param xparam the x parameter for the tile url - * @param yparam the y parameter for the tile url - * @param zparam the z parameter for the tile url - * @param baseURLs the base url for grabbing tiles (and alternative URLs) - */ - /* - * @param xr2l true if tile x is measured from the far left of the map to - * the far right, or else false if based on the center line. - * - * @param yt2b true if tile y is measured from the top (north pole) to the - * bottom (south pole) or else false if based on the equator. - */ - public TileFactoryInfo(int minimumZoomLevel, int maximumZoomLevel, int totalMapZoom, - int tileSize, boolean xr2l, boolean yt2b, String xparam, String yparam, String zparam, - String... baseURLs) { - this("name not provided", minimumZoomLevel, maximumZoomLevel, totalMapZoom, tileSize, xr2l, - yt2b, xparam, yparam, zparam, baseURLs); - } - - /** - * Creates a new instance of TileFactoryInfo. Note that TileFactoryInfo - * should be considered invariate, meaning that subclasses should ensure all - * of the properties stay the same after the class is constructed. Returning - * different values of getTileSize() for example is considered an error and - * may result in unexpected behavior. - * - * @param name A name to identify this information. - * @param minimumZoomLevel The minimum zoom level - * @param maximumZoomLevel the maximum zoom level - * @param totalMapZoom the top zoom level, essentially the height of the - * pyramid - * @param tileSize the size of the tiles in pixels (must be square) - * @param xr2l if the x goes r to l (is this backwards?) - * @param yt2b if the y goes top to bottom - * @param xparam the x parameter for the tile url - * @param yparam the y parameter for the tile url - * @param zparam the z parameter for the tile url - * @param baseURLs the base url for grabbing tiles (and alternative URLs) - */ - /* - * @param xr2l true if tile x is measured from the far left of the map to - * the far right, or else false if based on the center line. - * - * @param yt2b true if tile y is measured from the top (north pole) to the - * bottom (south pole) or else false if based on the equator. - */ - public TileFactoryInfo(String name, int minimumZoomLevel, int maximumZoomLevel, - int totalMapZoom, int tileSize, boolean xr2l, boolean yt2b, String xparam, - String yparam, String zparam, String... baseURLs) { - this.name = name; - this.minimumZoomLevel = minimumZoomLevel; - this.maximumZoomLevel = maximumZoomLevel; - this.totalMapZoom = totalMapZoom; - this.baseURLs = baseURLs; - this.xparam = xparam; - this.yparam = yparam; - this.zparam = zparam; - this.setXr2l(xr2l); - this.setYt2b(yt2b); - - this.tileSize = tileSize; - - // init the num tiles wide - int tilesize = this.getTileSize(0); - - longitudeDegreeWidthInPixels = new double[totalMapZoom + 1]; - longitudeRadianWidthInPixels = new double[totalMapZoom + 1]; - mapCenterInPixelsAtZoom = new Point2D.Double[totalMapZoom + 1]; - mapWidthInTilesAtZoom = new int[totalMapZoom + 1]; - - // for each zoom level - for (int z = totalMapZoom; z >= 0; --z) { - // how wide is each degree of longitude in pixels - longitudeDegreeWidthInPixels[z] = tilesize / 360.0; - // how wide is each radian of longitude in pixels - longitudeRadianWidthInPixels[z] = tilesize / (2.0 * Math.PI); - int t2 = tilesize / 2; - mapCenterInPixelsAtZoom[z] = new Point2D.Double(t2, t2); - mapWidthInTilesAtZoom[z] = tilesize / this.getTileSize(0); - tilesize *= 2; - } - - } - - /** - * Get the minimum zoom level - * - * @return the minimum zoom level - */ - public int getMinimumZoomLevel() { - return minimumZoomLevel; - } - -// public void setMinimumZoomLevel(int minimumZoomLevel) { -// this.minimumZoomLevel = minimumZoomLevel; -// } - - /** - * Get the maximum zoom level - * - * @return the maximum zoom level - */ - public int getMaximumZoomLevel() { - return maximumZoomLevel; - } -// -// public void setMaximumZoomLevel(int maximumZoomLevel) { -// this.maximumZoomLevel = maximumZoomLevel; -// } - - /** - * Get the top zoom level - * - * @return the top zoom level - */ - public int getTotalMapZoom() { - return totalMapZoom; - } - - /* - * public void setTotalMapZoom(int totalMapZoom) { this.totalMapZoom = - * totalMapZoom; } - */ - /** - * Get the with of a tile at the given zoom level - * - * @param zoom the zoom level - * - * @return the tile width in pixels - */ - public int getMapWidthInTilesAtZoom(int zoom) { - return mapWidthInTilesAtZoom[zoom]; - } - - /** - * Get the center position of the map at the given zoom level - * - * @param zoom the zoom level - * - * @return the center position in pixels - */ - public Point2D getMapCenterInPixelsAtZoom(int zoom) { - return mapCenterInPixelsAtZoom[zoom]; - } - - /** - * Returns the tile url (and its alternatives) for the specified tile at the - * specified zoom level. By default it will generate a tile url using the - * base url and parameters specified in the constructor. Thus if - * - * 
-	 * baseURl = http://www.myserver.com/maps?version=0.1 
-	 * xparam = x 
-	 * yparam = y 
-	 * zparam = z 
-	 * tilepoint = [1,2]
-	 * zoom level = 3
-	 * 
-	 *
- * - * then the resulting url would be: - * - * 
-	 * http://www.myserver.com/maps?version=0.1&x=1&y=2&z=3
-	 *
- * - * - * Note that the URL can be a file: url. - * - * @param zoom the zoom level - * @param x the tile x ordinate - * @param y the tile y ordinate - * @return a valid URL to load the tile - */ - public String[] getTileUrls(int x, int y, int zoom) { - // System.out.println("getting tile at zoom: " + zoom); - // System.out.println("map width at zoom = " + - // getMapWidthInTilesAtZoom(zoom)); - String ypart = "&" + yparam + "=" + y; - // System.out.println("ypart = " + ypart); - - if (!yt2b) { - int tilemax = getMapWidthInTilesAtZoom(zoom); - // int y = tilePoint.getY(); - ypart = "&" + yparam + "=" + (tilemax / 2 - y - 1); - } - // System.out.println("new ypart = " + ypart); - String[] result = new String[baseURLs.length]; - for (int i = 0; i < baseURLs.length; ++i) { - String url = baseURLs[i] + "&" + xparam + "=" + x + ypart + - // "&" + yparam + "=" + tilePoint.getY() + - "&" + zparam + "=" + zoom; - result[i] = url; - } - return result; - } - - /** - * Get the tile size. - * - * @param zoom the zoom level - * - * @return the tile size - */ - public int getTileSize(int zoom) { - return tileSize; - } - - /** - * Get the width of a longitude degree at the given zoom level - * - * @param zoom the zoom level - * - * @return the width in pixels - */ - public double getLongitudeDegreeWidthInPixels(int zoom) { - return longitudeDegreeWidthInPixels[zoom]; - } - - /** - * Get the width of a longitude radian at the given zoom level - * - * @param zoom the zoom level - * - * @return the width in pixels - */ - public double getLongitudeRadianWidthInPixels(int zoom) { - return longitudeRadianWidthInPixels[zoom]; - } - - /** - * A property indicating if the X coordinates of tiles go from right to left - * or left to right. - * - * @return if the x ordinates go from right to left - */ - public boolean isXr2l() { - return xr2l; - } - - /** - * A property indicating if the X coordinates of tiles go from right to left - * or left to right. - * - * @param xr2l if the x ordinates go from right to left - */ - public void setXr2l(boolean xr2l) { - this.xr2l = xr2l; - } - - /** - * A property indicating if the Y coordinates of tiles go from right to left - * or left to right. - * - * @return if the y ordinates go from top to bottom - */ - public boolean isYt2b() { - return yt2b; - } - - /** - * A property indicating if the Y coordinates of tiles go from right to left - * or left to right. - * - * @param yt2b if the y ordinates go from top to bottom - */ - public void setYt2b(boolean yt2b) { - this.yt2b = yt2b; - } - - /** - * Get the default zoom level - * - * @return the default zoom level - */ - public int getDefaultZoomLevel() { - return defaultZoomLevel; - } - - /** - * Set the default zoom level - * - * @param defaultZoomLevel the default zoom level - */ - public void setDefaultZoomLevel(int defaultZoomLevel) { - this.defaultZoomLevel = defaultZoomLevel; - } - - /** - * The name of this info. - * - * @return Returns the name of this info class for debugging or GUI widgets. - */ - public String getName() { - return name; - } - -} \ No newline at end of file diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileFactoryInfoConverter.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileFactoryInfoConverter.java deleted file mode 100644 index a699507b26..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileFactoryInfoConverter.java +++ /dev/null @@ -1,74 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -import java.awt.geom.Point2D; - -import org.jdesktop.swingx.mapviewer.util.GeoUtil; - -/** - * Google Mercator projection converter for TileFactories using TileFactoryInfo - * - * @author Simon Templer - * - * @deprecated use GoogleMercatorConverter instead - */ -@Deprecated -public class TileFactoryInfoConverter extends AbstractPixelConverter { - - private final TileFactoryInfo info; - - /** - * Constructor - * - * @param info the tile factory info - * @param geoConverter the geo converter - */ - public TileFactoryInfoConverter(TileFactoryInfo info, GeoConverter geoConverter) { - super(geoConverter); - - this.info = info; - } - - /** - * @see PixelConverter#geoToPixel(GeoPosition, int) - */ - @Override - public Point2D geoToPixel(GeoPosition pos, int zoom) throws IllegalGeoPositionException { - pos = geoConverter.convert(pos, GeoPosition.WGS_84_EPSG); - - return GeoUtil.getBitmapCoordinate(pos, zoom, info); - } - - /** - * @see PixelConverter#pixelToGeo(Point2D, int) - */ - @Override - public GeoPosition pixelToGeo(Point2D pixelCoordinate, int zoom) { - return GeoUtil.getPosition(pixelCoordinate, zoom, info); - } - - /** - * @see PixelConverter#getMapEpsg() - */ - @Override - public int getMapEpsg() { - return GeoPosition.WGS_84_EPSG; - } - - /** - * @see PixelConverter#supportsBoundingBoxes() - */ - @Override - public boolean supportsBoundingBoxes() { - return false; - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileFactoryInfoTileProvider.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileFactoryInfoTileProvider.java deleted file mode 100644 index 41650fe015..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileFactoryInfoTileProvider.java +++ /dev/null @@ -1,133 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -import java.net.URI; - -/** - * DefaultTileProvider - * - * @author Simon Templer - */ -@Deprecated -public class TileFactoryInfoTileProvider extends AbstractTileProvider { - - private final TileFactoryInfo info; - - private final GeoConverter geoConverter; - - /** - * Constructor - * - * @param info the tile factory info - * @param geoConverter the geo converter - */ - public TileFactoryInfoTileProvider(TileFactoryInfo info, GeoConverter geoConverter) { - super(); - - this.info = info; - this.geoConverter = geoConverter; - } - - /** - * @see AbstractTileProvider#createConverter() - */ - @Override - protected PixelConverter createConverter() { - return new TileFactoryInfoConverter(info, geoConverter); - } - - /** - * @see TileProvider#getDefaultZoom() - */ - @Override - public int getDefaultZoom() { - return info.getDefaultZoomLevel(); - } - - /** - * @see TileProvider#getMapHeightInTiles(int) - */ - @Override - public int getMapHeightInTiles(int zoom) { - // TileFactoryInfo doesn't support non square tile layout - return info.getMapWidthInTilesAtZoom(zoom); - } - - /** - * @see TileProvider#getMapWidthInTiles(int) - */ - @Override - public int getMapWidthInTiles(int zoom) { - return info.getMapWidthInTilesAtZoom(zoom); - } - - /** - * @see TileProvider#getMaximumZoom() - */ - @Override - public int getMaximumZoom() { - return info.getMaximumZoomLevel(); - } - - /** - * @see TileProvider#getMinimumZoom() - */ - @Override - public int getMinimumZoom() { - return info.getMinimumZoomLevel(); - } - - /** - * @see TileProvider#getTileHeight(int) - */ - @Override - public int getTileHeight(int zoom) { - return info.getTileSize(zoom); - } - - /** - * @see TileProvider#getTileWidth(int) - */ - @Override - public int getTileWidth(int zoom) { - return info.getTileSize(zoom); - } - - /** - * @see TileProvider#getTileUris(int, int, int) - */ - @Override - public URI[] getTileUris(int x, int y, int zoom) { - try { - String[] urls = info.getTileUrls(x, y, zoom); - if (urls == null) - return null; - else { - URI[] result = new URI[urls.length]; - for (int i = 0; i < urls.length; ++i) { - result[i] = URI.create(urls[i]); - } - return result; - } - } catch (Exception e) { - return null; - } - } - - /** - * @see TileProvider#getTotalMapZoom() - */ - @Override - public int getTotalMapZoom() { - return info.getTotalMapZoom(); - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileInfo.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileInfo.java deleted file mode 100644 index cd45a585dc..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileInfo.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.jdesktop.swingx.mapviewer; - -import java.net.URI; - -/** - * TileInfo - * - * @author Simon Templer - */ -public interface TileInfo { - - /** - * @return the zoom level that this tile belongs in - */ - public abstract int getZoom(); - - /** - * Gets the URI of this tile. - * - * @return the tile image URI - */ - public abstract URI getURI(); - - /** - * Gets a URI that uniquely identifies this tile (does not have to be the - * same URI as the one returned by {@link #getURI()}) - * - * @return the unique URI - */ - public abstract URI getIdentifier(); - - /** - * Get the tile x ordinate - * - * @return the tile x ordinate - */ - public abstract int getX(); - - /** - * Get the tile y ordinate - * - * @return the tile y ordinate - */ - public abstract int getY(); - -} \ No newline at end of file diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileOverlayPainter.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileOverlayPainter.java deleted file mode 100644 index 65911a842a..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileOverlayPainter.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.jdesktop.swingx.mapviewer; - -import java.awt.Graphics2D; -import java.awt.Rectangle; - -/** - * Tile overlay painter. - * - * @author Simon Templer - */ -public interface TileOverlayPainter extends Comparable { - - /** - * Set the current tile provider - * - * @param tiles the tile provider - */ - public void setTileProvider(TileProvider tiles); - - /** - * Paint a tile overlay. The parameters x, y and zoom can be used for - * caching. - * - * @param gfx the graphics device to paint on, its origin is at the upper - * left corner of the tile - * @param x the tile x number - * @param y the tile y number - * @param zoom the zoom level - * @param tilePosX the tile x position in pixel - * @param tilePosY the tile y position in pixel - * @param tileWidth the tile width - * @param tileHeight the tile height - * @param converter the pixel converter - * @param viewportBounds the view-port bounds - */ - public void paintTile(Graphics2D gfx, int x, int y, int zoom, int tilePosX, int tilePosY, - int tileWidth, int tileHeight, PixelConverter converter, Rectangle viewportBounds); - - /** - * Perform clean-up - */ - public void dispose(); - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileProvider.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileProvider.java deleted file mode 100644 index e8e010a9fc..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileProvider.java +++ /dev/null @@ -1,141 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -import java.net.URI; - -import org.jdesktop.swingx.painter.Painter; - -/** - * Provides map information and can generate tile urls. Combines information - * contained in former TileFactory and TileFactoryInfo classes. - * - * @author Simon Templer - */ -public interface TileProvider { - - /** - * Gets the size of an edge of a tile in pixels at the given zoom level. - * Tiles must be square. - * - * @param zoom the zoom level - * @return the size of an edge of a tile in pixels - */ - // public int getTileSize(int zoom); - - /** - * Gets the width of a tile in pixels at the given zoom level. - * - * @param zoom the zoom level - * @return the width of a tile in pixels - */ - public int getTileWidth(int zoom); - - /** - * Gets the height of a tile in pixels at the given zoom level. - * - * @param zoom the zoom level - * @return the height of a tile in pixels - */ - public int getTileHeight(int zoom); - - /** - * Get the PixelConverter that converts between map pixels and - * {@link GeoPosition}s - * - * @return the PixelConverter - */ - public PixelConverter getConverter(); - - /** - * Get the minimum zoom level, usually zero. The minimum zoom level is the - * zoom level where the map is displayed at maximum scale. - * - * @return the minimum zoom level - */ - public int getMinimumZoom(); - - /** - * Get the maximum zoom level, has to be greater than the minimum zoom level - * and less or equal the total map zoom level. - * - * @return the maximum zoom level - */ - public int getMaximumZoom(); - - /** - * Get the total map zoom level. The total map zoom level is the zoom level - * where the map is displayed at minimum scale. - * - * @return the total map zoom level - */ - public int getTotalMapZoom(); - - /** - * Returns the width of the map in tiles at the given zoom level - * - * @param zoom the zoom level - * @return the width of the map in tiles - */ - public int getMapWidthInTiles(int zoom); - - /** - * Returns the height of the map in tiles at the given zoom level - * - * @param zoom the zoom level - * @return the height of the map in tiles - */ - public int getMapHeightInTiles(int zoom); - - /** - * Returns an {@link URI} (and its alternatives) to the tile at the given - * tile coordinates and zoom level or null if there is no such - * tile. - * - * @param x the x tile coordinate (valid values lie between 0 and - * {@link #getMapWidthInTiles(int)}) - * @param y the y tile coordinate (valid values lie between 0 and - * {@link #getMapHeightInTiles(int)}) - * @param zoom the zoom level - * @return an {@link URI} (and its alternatives) to a tile or - * null - */ - public URI[] getTileUris(int x, int y, int zoom); - - /** - * Returns the default zoom level - * - * @return the default zoom level - */ - public int getDefaultZoom(); - - /** - * Specifies if horizontal wrapping shall be allowed for this map (makes - * sense for maps that show the whole world) - * - * @return if horizontal wrapping is allowed for this tile map - */ - public boolean getAllowHorizontalWrapping(); - - /** - * Specifies if tile borders shall be drawn for this tile map - * - * @return if tile borders shall be drawn for this tile map - */ - public boolean getDrawTileBorders(); - - /** - * Gets the custom overlay painter (may be null) - * - * @return the custom overlay painter - */ - public Painter getMapOverlayPainter(); - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileProviderUtils.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileProviderUtils.java deleted file mode 100644 index 88f012fab1..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/TileProviderUtils.java +++ /dev/null @@ -1,88 +0,0 @@ -/*+-------------+----------------------------------------------------------* - *| | |_|_|_|_| Fraunhofer-Institut fuer Graphische Datenverarbeitung * - *|__|__|_|_|_|_| (Fraunhofer Institute for Computer Graphics) * - *| | |_|_|_|_| * - *|__|__|_|_|_|_| * - *| __ | ___| * - *| /_ /_ / _ | Fraunhoferstrasse 5 * - *|/ / / /__/ | D-64283 Darmstadt, Germany * - *+-------------+----------------------------------------------------------*/ -package org.jdesktop.swingx.mapviewer; - -import java.awt.Dimension; -import java.awt.Point; -import java.awt.geom.Point2D; - -/** - * TileProviderUtils - * - * @author Simon Templer - */ -public abstract class TileProviderUtils { - - /** - * Returns the map center in pixels at the given zoom level - * - * @param tileProvider the {@link TileProvider} - * @param zoom the zoom level - * @return the map center in pixels - */ - public static Point2D getMapCenterInPixels(TileProvider tileProvider, int zoom) { - return new Point( - tileProvider.getTileWidth(zoom) * tileProvider.getMapWidthInTiles(zoom) / 2, - tileProvider.getTileHeight(zoom) * tileProvider.getMapHeightInTiles(zoom) / 2); - } - - /** - * Returns the map center position - * - * @param tileProvider the {@link TileProvider} - * @return the map center position - */ - public static GeoPosition getMapCenter(TileProvider tileProvider) { - int zoom = tileProvider.getMinimumZoom(); - - Point2D center = getMapCenterInPixels(tileProvider, zoom); - - return tileProvider.getConverter().pixelToGeo(center, zoom); - } - - /** - * Returns a Dimension containing the width and height of the map in tiles - * at the given zoom level. So a Dimension that returns 10x20 would be 10 - * tiles wide and 20 tiles tall. These values can be multipled by - * getTileSize() to determine the pixel width/height for the map at the - * given zoom level. - * - * @return the size of the world bitmap in tiles - * @param tileProvider the {@link TileProvider} - * @param zoom the current zoom level - */ - public static Dimension getMapSize(TileProvider tileProvider, int zoom) { - return new Dimension(tileProvider.getMapWidthInTiles(zoom), - tileProvider.getMapHeightInTiles(zoom)); - } - - /** - * Returns if the given tile coordinates and zoom level specify a valid tile - * - * @param tileProvider the {@link TileProvider} - * @param x the x tile coordinate - * @param y the y tile coordinate - * @param zoom the zoom level - * @return true if the given tile coordinates and zoom level specify a valid - * tile, otherwise false - */ - public static boolean isValidTile(TileProvider tileProvider, int x, int y, int zoom) { - if (x < 0 || y < 0) - return false; - if (zoom < tileProvider.getMinimumZoom() || zoom > tileProvider.getMaximumZoom()) - return false; - if (x >= tileProvider.getMapWidthInTiles(zoom) - || y >= tileProvider.getMapHeightInTiles(zoom)) - return false; - - return true; - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/Waypoint.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/Waypoint.java deleted file mode 100644 index 42ff6b6bfc..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/Waypoint.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Waypoint.java - * - * Created on March 30, 2006, 5:22 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer; - -import org.jdesktop.beans.AbstractBean; - -/** - * A Waypoint is a GeoPosition that can be drawn on a may using a - * WaypointPainter. - * - * @author joshy - */ -public class Waypoint extends AbstractBean { - - private GeoPosition position; - - /** - * Creates a new instance of Waypoint at lat/long 0,0 - */ - public Waypoint() { - this(new GeoPosition(0, 0, GeoPosition.WGS_84_EPSG)); - } - - @SuppressWarnings("javadoc") - public Waypoint(double x, double y, int epsg) { - this(new GeoPosition(x, y, epsg)); - } - - /** - * Creates a new instance of Waypoint at the specified GeoPosition - * - * @param coord a GeoPosition to initialize the new Waypoint - */ - public Waypoint(GeoPosition coord) { - this.position = coord; - } - - /** - * Get the current GeoPosition of this Waypoint - * - * @return the current position - */ - public GeoPosition getPosition() { - return position; - } - - /** - * Set a new GeoPosition for this Waypoint - * - * @param coordinate a new position - */ - public void setPosition(GeoPosition coordinate) { - GeoPosition old = getPosition(); - this.position = coordinate; - firePropertyChange("position", old, getPosition()); - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/WaypointPainter.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/WaypointPainter.java deleted file mode 100644 index 86330fb044..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/WaypointPainter.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * WaypointMapOverlay.java - * - * Created on April 1, 2006, 4:59 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer; - -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.Rectangle; -import java.awt.geom.Point2D; -import java.awt.geom.Rectangle2D; -import java.util.HashSet; -import java.util.Set; - -import org.jdesktop.swingx.painter.AbstractPainter; - -/** - * Paints waypoints on the JXMapViewer. This is an instance of Painter that only - * can draw on to JXMapViewers. - * - * @param the type of map viewer to paint on - * - * @author rbair - * @author Simon Templer - * - * @version $Id$ - */ -public class WaypointPainter extends AbstractPainter { - - private WaypointRenderer renderer = new DefaultWaypointRenderer(); - private Set waypoints; - - /** - * Creates a new instance of WaypointPainter - */ - public WaypointPainter() { - setAntialiasing(true); - setCacheable(false); - waypoints = new HashSet(); - } - - /** - * Sets the waypoint renderer to use when painting waypoints - * - * @param r the new WaypointRenderer to use - */ - public void setRenderer(WaypointRenderer r) { - this.renderer = r; - } - - /** - * Gets the current set of waypoints to paint - * - * @return a typed Set of Waypoints - */ - public Set getWaypoints() { - return waypoints; - } - - /** - * Sets the current set of waypoints to paint - * - * @param waypoints the new Set of Waypoints to use - */ - public void setWaypoints(Set waypoints) { - this.waypoints = waypoints; - } - - @Override - protected void doPaint(Graphics2D g, T map, int width, int height) { - if (renderer == null) { - return; - } - - // figure out which waypoints are within this map viewport - // so, get the bounds - Rectangle viewportBounds = map.getViewportBounds(); - int zoom = map.getZoom(); - Dimension sizeInTiles = TileProviderUtils.getMapSize(map.getTileFactory().getTileProvider(), - zoom); - int tileWidth = map.getTileFactory().getTileProvider().getTileWidth(zoom); - int tileHeight = map.getTileFactory().getTileProvider().getTileHeight(zoom); - Dimension sizeInPixels = new Dimension(sizeInTiles.width * tileWidth, - sizeInTiles.height * tileHeight); - - double vpx = viewportBounds.getX(); - // normalize the left edge of the viewport to be positive - while (vpx < 0) { - vpx += sizeInPixels.getWidth(); - } - // normalize the left edge of the viewport to no wrap around the world - while (vpx > sizeInPixels.getWidth()) { - vpx -= sizeInPixels.getWidth(); - } - - // create two new viewports next to eachother - Rectangle2D vp2 = new Rectangle2D.Double(vpx, viewportBounds.getY(), - viewportBounds.getWidth(), viewportBounds.getHeight()); - Rectangle2D vp3 = new Rectangle2D.Double(vpx - sizeInPixels.getWidth(), - viewportBounds.getY(), viewportBounds.getWidth(), viewportBounds.getHeight()); - - // for each waypoint within these bounds - for (Waypoint w : getWaypoints()) { - try { - Point2D point = map.getTileFactory().getTileProvider().getConverter() - .geoToPixel(w.getPosition(), map.getZoom()); - if (vp2.contains(point)) { - int x = (int) (point.getX() - vp2.getX()); - int y = (int) (point.getY() - vp2.getY()); - g.translate(x, y); - paintWaypoint(w, map, g); - g.translate(-x, -y); - } - if (vp3.contains(point)) { - int x = (int) (point.getX() - vp3.getX()); - int y = (int) (point.getY() - vp3.getY()); - g.translate(x, y); - paintWaypoint(w, map, g); - g.translate(-x, -y); - } - } catch (IllegalGeoPositionException e) { - // waypoint is not painted - out of bounds or invalid - } - } - } - - /** - *

- * Override this method if you want more control over how a waypoint is - * painted than what you can get by just plugging in a custom waypoint - * renderer. Most developers should not need to override this method and can - * use a WaypointRenderer instead. - *

- * - * - *

- * This method will be called to each waypoint with the graphics object - * pre-translated so that 0,0 is at the center of the waypoint. This saves - * the developer from having to deal with lat/long => screen coordinate - * transformations. - *

- * - * @param w the current waypoint - * @param map the current map - * @param g the current graphics context - * @see #setRenderer(WaypointRenderer) - * @see WaypointRenderer - */ - protected void paintWaypoint(final Waypoint w, final T map, final Graphics2D g) { - renderer.paintWaypoint(g, map, w); - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/WaypointRenderer.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/WaypointRenderer.java deleted file mode 100644 index 178606541c..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/WaypointRenderer.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * WaypointRenderer.java - * - * Created on March 30, 2006, 5:56 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer; - -import java.awt.Graphics2D; - -/** - * A interface that draws waypoints. Implementations of WaypointRenderer can be - * set on a WayPointPainter to draw waypoints on a JXMapViewer - * - * @author joshua.marinacci@sun.com - */ -public interface WaypointRenderer { - - /** - * Paint the specified way-point on the specified map and graphics context - * - * @param g the graphics device - * @param map the map viewer - * @param waypoint the way-point - * @return false - */ - public boolean paintWaypoint(Graphics2D g, JXMapViewer map, Waypoint waypoint); - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/bmng/CylindricalProjectionTileFactory.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/bmng/CylindricalProjectionTileFactory.java deleted file mode 100644 index 8a04a98116..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/bmng/CylindricalProjectionTileFactory.java +++ /dev/null @@ -1,63 +0,0 @@ -package org.jdesktop.swingx.mapviewer.bmng; - -//public class CylindricalProjectionTileFactory extends DefaultTileFactory { -// -// public CylindricalProjectionTileFactory() { -// this(new SLMapServerInfo()); -// } -// public CylindricalProjectionTileFactory(SLMapServerInfo info) { -// super(info); -// } -// -// public Dimension getMapSize(int zoom) { -// int midpoint = ((SLMapServerInfo)getInfo()).getMidpoint(); -// if(zoom < midpoint) { -// int w = (int)Math.pow(2,midpoint-zoom); -// return new Dimension(w,w/2); -// //return super.getMapSize(zoom); -// } -// return new Dimension(2,1); -// } -// -// public Point2D geoToPixel(GeoPosition c, int zoom) { -// // calc the pixels per degree -// Dimension mapSizeInTiles = getMapSize(zoom); -// //double size_in_tiles = (double)getInfo().getMapWidthInTilesAtZoom(zoom); -// //double size_in_tiles = Math.pow(2, getInfo().getTotalMapZoom() - zoom); -// double size_in_pixels = mapSizeInTiles.getWidth()*getInfo().getTileSize(zoom); -// double ppd = size_in_pixels / 360; -// -// // the center of the world -// double centerX = this.getTileSize(zoom)*mapSizeInTiles.getWidth()/2; -// double centerY = this.getTileSize(zoom)*mapSizeInTiles.getHeight()/2; -// -// double x = c.getX() * ppd + centerX; -// double y = -c.getY() * ppd + centerY; -// -// return new Point2D.Double(x, y); -// } -// -// public GeoPosition pixelToGeo(Point2D pix, int zoom) { -// // calc the pixels per degree -// Dimension mapSizeInTiles = getMapSize(zoom); -// double size_in_pixels = mapSizeInTiles.getWidth()*getInfo().getTileSize(zoom); -// double ppd = size_in_pixels / 360; -// -// // the center of the world -// double centerX = this.getTileSize(zoom)*mapSizeInTiles.getWidth()/2; -// double centerY = this.getTileSize(zoom)*mapSizeInTiles.getHeight()/2; -// -// double lon = (pix.getX() - centerX)/ppd; -// double lat = -(pix.getY() - centerY)/ppd; -// -// return new GeoPosition(lat,lon); -// } -// -// /* -// x = lat * ppd + fact -// x - fact = lat * ppd -// (x - fact)/ppd = lat -// y = -lat*ppd + fact -// -(y-fact)/ppd = lat -// */ -//} \ No newline at end of file diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/bmng/SLMapServerInfo.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/bmng/SLMapServerInfo.java deleted file mode 100644 index 179b7d524d..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/bmng/SLMapServerInfo.java +++ /dev/null @@ -1,96 +0,0 @@ -package org.jdesktop.swingx.mapviewer.bmng; - -import org.jdesktop.swingx.mapviewer.TileFactoryInfo; - -/** - * A TileFactoryInfo subclass which knows how to connect to the SwingLabs map - * server. This server contains 2k resolution Blue Marble data from NASA. - */ -@Deprecated -@SuppressWarnings("javadoc") -public class SLMapServerInfo extends TileFactoryInfo { - - private static final int pyramid_top = 8 + 1; - private static final int midpoint = 5; - private static final int normal_tile_size = 675; - - public SLMapServerInfo() { - this("http://maps.joshy.net/tiles/bmng_tiles_3"); - } - - public SLMapServerInfo(String baseURL) { - // joshy: this was version one of the tiles - // super(0, 5, 5, 256, true, false, - // "http://maps.joshy.net/bmng_tiles_1", "", "", ""); - // super(0, pyramid_top-1, pyramid_top, - // 675, - // true, false, "http://maps.joshy.net/bmng_tiles_2", "", "", ""); - // super(0, pyramid_top-1, pyramid_top, - // normal_tile_size, - // true, false, - // "file:/Users/joshy/projects/java.net/ImageTileCutter/tiles", "", "", - // ""); - super(0, pyramid_top - 1, pyramid_top, normal_tile_size, true, false, "", "", "", baseURL); - setDefaultZoomLevel(0); - } - - public int getMidpoint() { - return midpoint; - } - - @Override - public int getTileSize(int zoom) { - int size = super.getTileSize(zoom); - if (zoom < midpoint) { - return size; - } - else { - for (int i = 0; i < zoom + 1 - midpoint; i++) { - size = size / 2; - } - return size; - } - } - - @Override - public int getMapWidthInTilesAtZoom(int zoom) { - if (zoom < midpoint) { - return (int) Math.pow(2, midpoint - zoom); - } - else { - return 1; - } - } - - @Override - public String[] getTileUrls(int x, int y, int zoom) { - int ty = y; - int tx = x; - - // int width_in_tiles = (int)Math.pow(2,pyramid_top-zoom); - int width_in_tiles = getMapWidthInTilesAtZoom(zoom); - // System.out.println("width in tiles = " + width_in_tiles + " x = " + - // tx + " y = " + ty); - if (ty < 0) { - return null; - } - if (zoom < midpoint) { - if (ty >= width_in_tiles / 2) { - return null; - } - } - else { - if (ty != 0) { - return null; - } - } - - String[] result = new String[baseURLs.length]; - for (int i = 0; i < baseURLs.length; ++i) { - String url = this.baseURLs[i] + "/" + zoom + "/" + ty + "/" + tx + ".jpg"; - result[i] = url; - } - return result; - } - -} \ No newline at end of file diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/empty/EmptyTileFactory.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/empty/EmptyTileFactory.java deleted file mode 100644 index c8a0231381..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/empty/EmptyTileFactory.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * EmptyTileFactory.java - * - * Created on June 7, 2006, 4:58 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer.empty; - -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.image.BufferedImage; - -import org.jdesktop.swingx.mapviewer.GeoConverter; -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.IllegalGeoPositionException; -import org.jdesktop.swingx.mapviewer.Tile; -import org.jdesktop.swingx.mapviewer.TileFactory; -import org.jdesktop.swingx.mapviewer.TileFactoryInfo; -import org.jdesktop.swingx.mapviewer.TileFactoryInfoTileProvider; -import org.jdesktop.swingx.mapviewer.TileProvider; - -/** - * A null implementation of TileFactory. Draws empty areas. - * - * @author joshy - */ -@SuppressWarnings("deprecation") -public class EmptyTileFactory implements TileFactory { - - /** The empty tile image. */ - private BufferedImage emptyTile; - - private final TileProvider provider; - - /** Creates a new instance of EmptyTileFactory using the specified info. */ - public EmptyTileFactory() { - provider = new TileFactoryInfoTileProvider(new TileFactoryInfo("EmptyTileFactory 256x256", - 1, 15, 17, 256, true, true, "x", "y", "z", ""), new GeoConverter() { - - @Override - public GeoPosition convert(GeoPosition pos, int targetEpsg) - throws IllegalGeoPositionException { - if (pos.getEpsgCode() == targetEpsg) { - return new GeoPosition(pos.getX(), pos.getY(), targetEpsg); - } - else - throw new IllegalGeoPositionException(); - } - }); - - int tileWidth = provider.getTileWidth(provider.getMinimumZoom()); - int tileHeight = provider.getTileHeight(provider.getMinimumZoom()); - emptyTile = new BufferedImage(tileWidth, tileHeight, BufferedImage.TYPE_INT_ARGB); - Graphics2D g = emptyTile.createGraphics(); - g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g.setColor(Color.GRAY); - g.fillRect(0, 0, tileWidth, tileHeight); - g.setColor(Color.WHITE); - g.drawOval(10, 10, tileWidth - 20, tileHeight - 20); - g.fillOval(70, 50, 20, 20); - g.fillOval(tileWidth - 90, 50, 20, 20); - g.fillOval(tileWidth / 2 - 10, tileHeight / 2 - 10, 20, 20); - g.dispose(); - } - - /** - * Gets an instance of an empty tile for the given tile position and zoom on - * the world map. - * - * @param x The tile's x position on the world map. - * @param y The tile's y position on the world map. - * @param zoom The current zoom level. - */ - @Override - public Tile getTile(int x, int y, int zoom) { - return new Tile(x, y, zoom) { - - @Override - public boolean isLoaded() { - return true; - } - - @Override - public BufferedImage getImage() { - return emptyTile; - } - - }; - } - - /** - * Override this method to load the tile using, for example, an - * ExecutorService. - * - * @param tile The tile to load. - */ - @Override - public void startLoading(Tile tile) { - // noop - } - - /** - * @see TileFactory#getTileProvider() - */ - @Override - public TileProvider getTileProvider() { - return provider; - } - - /** - * @see TileFactory#cleanup() - */ - @Override - public void cleanup() { - // do nothing - } - - /** - * @see TileFactory#clearCache() - */ - @Override - public void clearCache() { - // do nothing - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/esri/ESRITileFactory.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/esri/ESRITileFactory.java deleted file mode 100644 index d23322e39a..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/esri/ESRITileFactory.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * ESRITileFactory.java - * - * Created on November 7, 2006, 10:51 AM - * - * To change this template, choose Tools | Template Manager and open the - * template in the editor. - */ - -//package org.jdesktop.swingx.mapviewer.esri; -// -//import java.awt.geom.Point2D; -//import java.math.BigDecimal; -//import java.math.RoundingMode; -//import org.jdesktop.swingx.mapviewer.DefaultTileFactory; -//import org.jdesktop.swingx.mapviewer.GeoPosition; -//import org.jdesktop.swingx.mapviewer.TileFactoryInfo; -//import org.jdesktop.swingx.mapviewer.util.GeoUtil; -// -///** -// * -// * @author rbair -// */ -//public class ESRITileFactory extends DefaultTileFactory { -// private static final String projection = "8"; //mercator projection -// private static final String format = "png"; //get pngs back -// private String username; -// private char[] password; -// private String userId; -// private String datasource; //should be enum -// -// /** Creates a new instance of ESRITileFactory */ -// public ESRITileFactory() { -// super(new ESRITileProviderInfo()); -// ((ESRITileProviderInfo)super.getInfo()).factory = this; -// datasource = "ArcWeb:TA.Streets.NA"; -// } -// -// public void setUsername(String name) { -// this.username = name; -// } -// -// public void setPassword(char[] password) { -// this.password = password; -// } -// -// public void setUserID(String id) { -// //temp hack -// this.userId = id; -// } -// -// private static final class ESRITileProviderInfo extends TileFactoryInfo { -// private ESRITileFactory factory; -// -// private ESRITileProviderInfo() { -// super(0, 17, 18, 256, false, true, "http://www.arcwebservices.com/services/v2006/restmap?actn=getMap", "", "", ""); -// } -// -// public String getTileUrl(int x, int y, int zoom) { -//// "&usrid=&ds=&c=-117.1817|34.0556&sf=52500&fmt=&ocs="; -// //System.out.println("getting tile at zoom: " + zoom); -// //System.out.println("map width at zoom = " + getMapWidthInTilesAtZoom(zoom)); -// -// //provide the center point of the tile, in lat/long coords -// int tileY = y; -// int tileX = x; -// int pixelX = tileX * factory.getTileSize(zoom) + (factory.getTileSize(zoom) / 2); -// int pixelY = tileY * factory.getTileSize(zoom) + (factory.getTileSize(zoom) / 2); -// -// GeoPosition latlong = GeoUtil.getPosition(new Point2D.Double(pixelX, pixelY), zoom, this); -// -// //Chris is going to hate me for this (relying on 72dpi!), but: -// //72 pixels per inch. The earth is 24,859.82 miles in circumference, at the equator. -// //Thus, the earth is 24,859.82 * 5280 * 12 * 72 pixels in circumference. -// -// double numFeetPerDegreeLong = 24859.82 * 5280 / 360; //the number of feet per degree longitude at the equator -// double numPixelsPerDegreeLong = getLongitudeDegreeWidthInPixels(zoom); -// double numPixelsPerFoot = 96 * 12; -// int sf = (int)(numFeetPerDegreeLong / (numPixelsPerDegreeLong / numPixelsPerFoot)); -// -// //round lat and long to 5 decimal places -// BigDecimal lat = new BigDecimal(latlong.getY()); -// BigDecimal lon = new BigDecimal(latlong.getX()); -// lat = lat.setScale(5, RoundingMode.DOWN); -// lon = lon.setScale(5, RoundingMode.DOWN); -// System.out.println("Tile : [" + tileX + ", " + tileY + "]"); -// System.out.println("Pixel : [" + pixelX + ", " + pixelY + "]"); -// System.out.println("Lat/Long : [" + latlong.getY() + ", " + latlong.getX() + "]"); -// System.out.println("Lat2/Long2: [" + lat.doubleValue() + ", " + lon.doubleValue() + "]"); -// -// String url = baseURL + -// "&usrid=" + factory.userId + -// "&ds=" + factory.datasource + -// "&c=" + lon.doubleValue() + "%7C" + lat.doubleValue() + -// "&sf=" + sf + //52500" + -// "&fmt=" + format + -// "&ocs=" + projection; -// System.out.println("the URL: " + url); -// return url; -// } -// } -//} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/resources/loading.png b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/resources/loading.png deleted file mode 100644 index c65be32c23..0000000000 Binary files a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/resources/loading.png and /dev/null differ diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/resources/minus.png b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/resources/minus.png deleted file mode 100644 index 8fe9a8d4a7..0000000000 Binary files a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/resources/minus.png and /dev/null differ diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/resources/plus.png b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/resources/plus.png deleted file mode 100644 index c4b2097f5f..0000000000 Binary files a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/resources/plus.png and /dev/null differ diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/resources/standard_waypoint.png b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/resources/standard_waypoint.png deleted file mode 100644 index 7b13069568..0000000000 Binary files a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/resources/standard_waypoint.png and /dev/null differ diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/util/GeoUtil.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/util/GeoUtil.java deleted file mode 100644 index 8601fdd417..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/util/GeoUtil.java +++ /dev/null @@ -1,263 +0,0 @@ -/* - * GeoUtil.java - * - * Created on June 26, 2006, 10:44 AM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer.util; - -import java.awt.Dimension; -import java.awt.geom.Point2D; -import java.io.IOException; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URL; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.xpath.XPath; -import javax.xml.xpath.XPathConstants; -import javax.xml.xpath.XPathFactory; - -import org.jdesktop.swingx.mapviewer.GeoPosition; -import org.jdesktop.swingx.mapviewer.TileFactoryInfo; -import org.jdesktop.swingx.mapviewer.TileProvider; -import org.w3c.dom.Document; -import org.xml.sax.SAXException; - -/** - * These are math utilities for converting between pixels, tiles, and geographic - * coordinates. Implements a Google Maps style mercator projection. - * - * @author joshy - */ -@Deprecated -public final class GeoUtil { - - /** - * Get the map size at the given zoom level - * - * @param zoom the zoom level - * @param info the tile factory info - * - * @return the size of the map at the given zoom, in tiles (num tiles tall - * by num tiles wide) - */ - public static Dimension getMapSize(int zoom, TileProvider info) { - return new Dimension(info.getMapWidthInTiles(zoom), info.getMapWidthInTiles(zoom)); - } - - /** - * Check if parameters specify a valid tile - * - * @param x the tile x ordinate - * @param y the tile y ordinate - * @param zoomLevel the zoom level - * @param info the tile factory info - * - * @return true if this point in tiles is valid at this zoom level. - * For example, if the zoom level is 0 (zoomed all the way out, - * where there is only one tile), then x,y must be 0,0 - */ - public static boolean isValidTile(int x, int y, int zoomLevel, TileFactoryInfo info) { - // int x = (int)coord.getX(); - // int y = (int)coord.getY(); - // if off the map to the top or left - if (x < 0 || y < 0) { - return false; - } - // if of the map to the right - if (info.getMapCenterInPixelsAtZoom(zoomLevel).getX() * 2 <= x - * info.getTileSize(zoomLevel)) { - return false; - } - // if off the map to the bottom - if (info.getMapCenterInPixelsAtZoom(zoomLevel).getY() * 2 <= y - * info.getTileSize(zoomLevel)) { - return false; - } - // if out of zoom bounds - if (zoomLevel < info.getMinimumZoomLevel() || zoomLevel > info.getMaximumZoomLevel()) { - return false; - } - return true; - } - - /** - * Given a position (latitude/longitude pair) and a zoom level, return the - * appropriate point in pixels. The zoom level is necessary because - * pixel coordinates are in terms of the zoom level - * - * - * @param c A lat/lon pair - * @param zoomLevel the zoom level to extract the pixel coordinate for - * @param info the tile factory info - * - * @return the position on the map in pixels - */ - public static Point2D getBitmapCoordinate(GeoPosition c, int zoomLevel, TileFactoryInfo info) { - return getBitmapCoordinate(c.getY(), c.getX(), zoomLevel, info); - } - - /** - * Given a position (latitude/longitude pair) and a zoom level, return the - * appropriate point in pixels. The zoom level is necessary because - * pixel coordinates are in terms of the zoom level - * - * - * @param latitude - * @param longitude - * @param zoomLevel the zoom level to extract the pixel coordinate for - * @param info the tile factory info - * - * @return the position on the map in pixels - */ - @SuppressWarnings("javadoc") - public static Point2D getBitmapCoordinate(double latitude, double longitude, int zoomLevel, - TileFactoryInfo info) { - - double x = info.getMapCenterInPixelsAtZoom(zoomLevel).getX() - + longitude * info.getLongitudeDegreeWidthInPixels(zoomLevel); - double e = Math.sin(latitude * (Math.PI / 180.0)); - if (e > 0.9999) { - e = 0.9999; - } - if (e < -0.9999) { - e = -0.9999; - } - double y = info.getMapCenterInPixelsAtZoom(zoomLevel).getY() - + 0.5 * Math.log((1 + e) / (1 - e)) * -1 - * (info.getLongitudeRadianWidthInPixels(zoomLevel)); - return new Point2D.Double(x, y); - } - - /** - * convert an on screen pixel coordinate and a zoom level to a geo position - * - * @param pixelCoordinate the pixel coordinate - * @param zoom the zoom level - * @param info the tile factory info - * - * @return the corresponding geo position in WGS84 - */ - public static GeoPosition getPosition(Point2D pixelCoordinate, int zoom, TileFactoryInfo info) { - // p(" --bitmap to latlon : " + coord + " " + zoom); - double wx = pixelCoordinate.getX(); - double wy = pixelCoordinate.getY(); - // this reverses getBitmapCoordinates - double flon = (wx - info.getMapCenterInPixelsAtZoom(zoom).getX()) - / info.getLongitudeDegreeWidthInPixels(zoom); - double e1 = (wy - info.getMapCenterInPixelsAtZoom(zoom).getY()) - / (-1 * info.getLongitudeRadianWidthInPixels(zoom)); - double e2 = (2 * Math.atan(Math.exp(e1)) - Math.PI / 2) / (Math.PI / 180.0); - double flat = e2; - GeoPosition wc = new GeoPosition(flon, flat, GeoPosition.WGS_84_EPSG); - return wc; - } - - /** - * Convert a street address into a position. Uses the Yahoo GeoCoder. You - * must supply your own yahoo id - * - * @param fields an array of Street, City and State (must be a US state) - * @throws java.io.IOException if the request fails. - * @return the position of this street address - */ - public static GeoPosition getPositionForAddress(String[] fields) throws IOException { - return getPositionForAddress(fields[0], fields[1], fields[2]); - } - - /** - * Convert a street address into a position. Uses the Yahoo GeoCoder. You - * must supply your own yahoo id. - * - * @param street Street - * @param city City - * @param state State (must be a US state) - * @throws java.io.IOException if the request fails. - * @return the position of this street address - */ - public static GeoPosition getPositionForAddress(String street, String city, String state) - throws IOException { - URL load = new URL("http://api.local.yahoo.com/MapsService/V1/geocode?" + "appid=joshy688" - + "&street=" + street.replace(' ', '+') + "&city=" + city.replace(' ', '+') - + "&state=" + state.replace(' ', '+')); - - HttpURLConnection connection = null; - try { - connection = (HttpURLConnection) load.openConnection(); - connection.setRequestMethod("GET"); - - // Ensure secure XML processing - DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance(); - builderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true); - builderFactory.setFeature("http://xml.org/sax/features/external-general-entities", - false); - builderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", - false); - builderFactory.setFeature( - "http://apache.org/xml/features/nonvalidating/load-external-dtd", false); - builderFactory.setFeature(javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true); - - DocumentBuilder builder = builderFactory.newDocumentBuilder(); - - // Parse the response using try-with-resources - try (InputStream inputStream = connection.getInputStream()) { - Document doc = builder.parse(inputStream); - - // Use XPath to extract data - XPath xpath = XPathFactory.newInstance().newXPath(); - Double lat = (Double) xpath.evaluate("//Result/Latitude/text()", doc, - XPathConstants.NUMBER); - Double lon = (Double) xpath.evaluate("//Result/Longitude/text()", doc, - XPathConstants.NUMBER); - - return new GeoPosition(lon, lat, GeoPosition.WGS_84_EPSG); - } - - } catch (ParserConfigurationException | SAXException e) { - throw new IOException("Error parsing XML response", e); - } catch (Exception e) { - throw new IOException("Failed to retrieve location information: " + e.getMessage(), e); - } finally { - if (connection != null) { - connection.disconnect(); - } - } - } - - /** - * Gets the map bounds. - * - * @param mapViewer The map viewer. - * @return Returns the bounds. - */ - /* - * public static GeoBounds getMapBounds(JXMapViewer mapViewer) { return new - * GeoBounds(getMapGeoBounds(mapViewer)); } - */ - - /** - * Gets the bounds as a set of two GeoPosition objects. - * - * @param mapViewer The map viewer. - * @return Returns the set of two GeoPosition objects that - * represent the north west and south east corners of the map. - */ - /* - * private static Set getMapGeoBounds(JXMapViewer mapViewer) { - * Set set = new HashSet(); TileFactory - * tileFactory = mapViewer.getTileFactory(); int zoom = mapViewer.getZoom(); - * Rectangle2D bounds = mapViewer.getViewportBounds(); Point2D pt = new - * Point2D.Double(bounds.getX(), bounds.getY()); - * set.add(tileFactory.pixelToGeo(pt, zoom)); pt = new - * Point2D.Double(bounds.getX() + bounds.getWidth(), bounds .getY() + - * bounds.getHeight()); set.add(tileFactory.pixelToGeo(pt, zoom)); return - * set; } - */ - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/util/MercatorUtils.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/util/MercatorUtils.java deleted file mode 100644 index 67dcda26cf..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/util/MercatorUtils.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * MercatorUtils.java - * - * Created on October 7, 2006, 6:02 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer.util; - -/** - * A utility class of methods that help when dealing with standard Mercator - * projections. - * - * @author joshua.marinacci@sun.com - */ -@SuppressWarnings("javadoc") -public final class MercatorUtils { - - /** Creates a new instance of MercatorUtils */ - private MercatorUtils() { - } - - public static int longToX(double longitudeDegrees, double radius) { - double longitude = Math.toRadians(longitudeDegrees); - return (int) (radius * longitude); - } - - public static int latToY(double latitudeDegrees, double radius) { - double latitude = Math.toRadians(latitudeDegrees); - double y = radius / 2.0 * Math.log((1.0 + Math.sin(latitude)) / (1.0 - Math.sin(latitude))); - return (int) y; - } - - public static double xToLong(int x, double radius) { - double longRadians = x / radius; - double longDegrees = Math.toDegrees(longRadians); - /* - * The user could have panned around the world a lot of times. Lat long - * goes from -180 to 180. So every time a user gets to 181 we want to - * subtract 360 degrees. Every time a user gets to -181 we want to add - * 360 degrees. - */ - int rotations = (int) Math.floor((longDegrees + 180) / 360); - double longitude = longDegrees - (rotations * 360); - return longitude; - } - - public static double yToLat(int y, double radius) { - double latitude = (Math.PI / 2) - (2 * Math.atan(Math.exp(-1.0 * y / radius))); - return Math.toDegrees(latitude); - } -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/wms/WMSService.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/wms/WMSService.java deleted file mode 100644 index 38e3a4b845..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/wms/WMSService.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * WMSService.java - * - * Created on October 7, 2006, 6:06 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer.wms; - -import org.jdesktop.swingx.mapviewer.util.MercatorUtils; - -/** - * A class that represents a WMS mapping service. See - * http://en.wikipedia.org/wiki/Web_Map_Service for more information. - * - * @author joshy - */ -@SuppressWarnings("javadoc") -@Deprecated -public class WMSService { - - private String baseUrl; - private String layer; - - /** Creates a new instance of WMSService */ - public WMSService() { - // by default use a known nasa server - setLayer("BMNG"); - setBaseUrl("http://wms.jpl.nasa.gov/wms.cgi?"); - } - - public WMSService(String baseUrl, String layer) { - this.baseUrl = baseUrl; - this.layer = layer; - } - - public String toWMSURL(int x, int y, int zoom, int tileSize) { - String format = "image/jpeg"; - // String layers = "BMNG"; - String styles = ""; - String srs = "EPSG:4326"; - int ts = tileSize; - int circumference = widthOfWorldInPixels(zoom, tileSize); - double radius = circumference / (2 * Math.PI); - double ulx = MercatorUtils.xToLong(x * ts, radius); - double uly = MercatorUtils.yToLat(y * ts, radius); - double lrx = MercatorUtils.xToLong((x + 1) * ts, radius); - double lry = MercatorUtils.yToLat((y + 1) * ts, radius); - String bbox = ulx + "," + uly + "," + lrx + "," + lry; - String url = getBaseUrl() + "version=1.1.1&request=" + "GetMap&Layers=" + layer + "&format=" - + format + "&BBOX=" + bbox + "&width=" + ts + "&height=" + ts + "&SRS=" + srs - + "&Styles=" + styles + - // "&transparent=TRUE"+ - ""; - return url; - } - - private int widthOfWorldInPixels(int zoom, int TILE_SIZE) { -// int TILE_SIZE = 256; - int tiles = (int) Math.pow(2, zoom); - int circumference = TILE_SIZE * tiles; - return circumference; - } - - public String getLayer() { - return layer; - } - - public void setLayer(String layer) { - this.layer = layer; - } - - public String getBaseUrl() { - return baseUrl; - } - - public void setBaseUrl(String baseUrl) { - this.baseUrl = baseUrl; - } - -} diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/wms/WMSTileFactory.java b/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/wms/WMSTileFactory.java deleted file mode 100644 index 799044a5ac..0000000000 --- a/ext/styledmap/org.jdesktop.swingx.mapviewer/src/org/jdesktop/swingx/mapviewer/wms/WMSTileFactory.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * WMSTileFactory.java - * - * Created on October 7, 2006, 6:07 PM - * - * To change this template, choose Tools | Template Manager - * and open the template in the editor. - */ - -package org.jdesktop.swingx.mapviewer.wms; - -import org.jdesktop.swingx.mapviewer.DefaultTileFactory; -import org.jdesktop.swingx.mapviewer.GeotoolsConverter; -import org.jdesktop.swingx.mapviewer.TileCache; -import org.jdesktop.swingx.mapviewer.TileFactoryInfo; -import org.jdesktop.swingx.mapviewer.TileFactoryInfoTileProvider; - -/** - * A tile factory that uses a WMS service. - * - * Provides wrong coordinates. - * - * @author joshy - */ -@Deprecated -public class WMSTileFactory extends DefaultTileFactory { - - /* - * todos: nuke the google url. it's not needed. rework the var names to make - * them make sense remove - */ - /** - * Creates a new instance of WMSTileFactory - * - * @param wms - * @param cache - */ - @SuppressWarnings("javadoc") - public WMSTileFactory(final WMSService wms, TileCache cache) { - // tile size and x/y orientation is r2l & t2b - super(new TileFactoryInfoTileProvider( - new TileFactoryInfo(0, 15, 17, 500, true, true, "x", "y", "zoom", "") { - - @Override - public String[] getTileUrls(int x, int y, int zoom) { - int zz = 17 - zoom; - int z = 4; - z = (int) Math.pow(2, (double) zz - 1); - return new String[] { - wms.toWMSURL(x - z, z - 1 - y, zz, getTileSize(zoom)) }; - } - - }, GeotoolsConverter.getInstance()), cache); - } - -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 98b8f4fb32..44f02d597e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,30 @@ [versions] slf4j = "1.7.36" +logback = "1.2.12" slf4jplus = "1.2.0.201503311443" spring = "5.2.0.RELEASE" groovy = "2.5.19" tinkerpop = "2.5.0-orientDB151" orientdb = "1.5.1" +orient-common = "1.5.5" geotools = "29.1" batik = "1.8" +prometheus = "0.16.0" +apache-http-client = "4.5.13" +ehcache = "2.6.11" +castor = "1.4.1" [libraries] +# TODO add project builds? +model-align = {module = "eu.esdihumboldt.hale:eu.esdihumboldt.hale.common.align.io.model.jaxb", version = '2.9.9'} +model-project = {module = "eu.esdihumboldt.hale:eu.esdihumboldt.hale.common.core.io.project.model.jaxb", version = '2.9.9'} + +castor-xml = {module = "org.codehaus.castor:castor-xml", version.ref = "castor"} + +ehcache = {module = "net.sf.ehcache:ehcache-core", version.ref = "ehcache"} + +prometheus-client = {module = "io.prometheus:simpleclient", version.ref = "prometheus"} + geotools-opengis = {module = "org.geotools:gt-opengis", version.ref = "geotools"} geotools-main = {module = "org.geotools:gt-main", version.ref = "geotools"} geotools-referencing = {module = "org.geotools:gt-referencing", version.ref = "geotools"} @@ -16,11 +32,17 @@ geotools-epsg = {module = "org.geotools:gt-epsg-hsql", version.ref = "geotools"} groovy-core = {module = "org.codehaus.groovy:groovy", version.ref = "groovy"} groovy-test = {module = "org.codehaus.groovy:groovy-test", version.ref = "groovy"} +groovy-templates = {module = "org.codehaus.groovy:groovy-templates", version.ref = "groovy"} groovy-json = {module = "org.codehaus.groovy:groovy-json", version.ref = "groovy"} groovy-xml = {module = "org.codehaus.groovy:groovy-xml", version.ref = "groovy"} +groovy-sandbox = {module = "eu.esdihumboldt.unpuzzled:org.kohsuke.groovy.sandbox", version = "1.6.0.hale"} + slf4j-api = {module = "org.slf4j:slf4j-api", version.ref = "slf4j"} +logback-core = {module = "ch.qos.logback:logback-core", version.ref = "logback"} +logback-classic = {module = "ch.qos.logback:logback-classic", version.ref = "logback"} + slf4jplus-api = {module = "eu.esdihumboldt.unpuzzled:de.fhg.igd.slf4jplus", version.ref = "slf4jplus"} slf4jplus-logback = {module = "eu.esdihumboldt.unpuzzled:de.fhg.igd.slf4jplus.logback", version.ref = "slf4jplus"} slf4jplus-logback-appender = {module = "eu.esdihumboldt.unpuzzled:de.fhg.igd.slf4jplus.logback.appender", version.ref = "slf4jplus"} @@ -36,8 +58,10 @@ commons-io = {module = "commons-io:commons-io", version = "2.14.0"} commons-lang = {module = "commons-lang:commons-lang", version = "2.6"} igd-eclipse-util = {module = "eu.esdihumboldt.unpuzzled:de.fhg.igd.eclipse.util", version = "1.0.0.201407081822"} +igd-osgi-util = {module = "de.fhg.igd:osgi-util", version = "1.0"} eclipse-core-runtime = {module = "eu.esdihumboldt.unpuzzled:org.eclipse.core.runtime", version = "3.17.100.v20200203-0917"} +eclipse-equinox-registry = {module = "eu.esdihumboldt.unpuzzled:org.eclipse.equinox.registry", version = "3.8.700.v20200121-1457"} spring-core = {module = "org.springframework:spring-core", version.ref = "spring"} @@ -45,6 +69,7 @@ tinkerpop-blueprints-core = {module = "com.tinkerpop.blueprints:blueprints-core" tinkerpop-blueprints-orient = {module = "com.tinkerpop.blueprints:blueprints-orient-graph", version.ref = "tinkerpop"} orientdb-core = {module = "com.orientechnologies:orientdb-core", version.ref = "orientdb"} +orient-common = {module = "com.orientechnologies:orient-commons", version.ref = "orient-common"} snakeyaml = {module = "org.yaml:snakeyaml", version = "2.2"} @@ -53,5 +78,11 @@ jts = {module = "org.locationtech.jts:jts-core", version = "1.19.0"} batik-svggen = {module = "org.apache.xmlgraphics:batik-svggen", version.ref = "batik"} batik-dom = {module = "org.apache.xmlgraphics:batik-dom", version.ref = "batik"} +apache-http-core = {module = "org.apache.httpcomponents:httpcore", version = "4.4.13"} +apache-http-client = {module = "org.apache.httpcomponents:httpclient", version.ref = "apache-http-client"} +apache-http-fluent = {module = "org.apache.httpcomponents:fluent-hc", version.ref = "apache-http-client"} + +jaxb-runtime = {module = "org.glassfish.jaxb:jaxb-runtime", version = "4.0.1"} + [bundles] slf4jplus = ['slf4jplus-api', 'slf4jplus-logback', 'slf4jplus-logback-appender', 'slf4jplus-logback-observer'] diff --git a/updateversionnumbers.groovy b/updateversionnumbers.groovy deleted file mode 100755 index 769f205185..0000000000 --- a/updateversionnumbers.groovy +++ /dev/null @@ -1,389 +0,0 @@ -#!/usr/bin/env groovy - -import java.util.jar.Manifest - -ant = new AntBuilder() - -ant.patternset(id: 'manifests') { - include(name: '**/MANIFEST.MF') - exclude(name: '**/build/') - exclude(name: '**/.git/') - exclude(name: '**/bin/') - exclude(name: '**/classes/') - exclude(name: '**/platform/') - exclude(name: '**/target/') -} - -ant.patternset(id: 'plugins') { - include(name: '**/plugin.xml') - exclude(name: '**/build/') - exclude(name: '**/.svn/') - exclude(name: '**/bin/') - exclude(name: '**/classes/') - exclude(name: '**/platform/') - exclude(name: '**/target/') -} - -ant.patternset(id: 'features') { - include(name: '**/feature.xml') - exclude(name: '**/build/') - exclude(name: '**/.svn/') - exclude(name: '**/bin/') - exclude(name: '**/classes/') - exclude(name: '**/platform/') - exclude(name: '**/target/') -} - -ant.patternset(id: 'products') { - include(name: '**/*.product') - exclude(name: '**/build/') - exclude(name: '**/.git/') - exclude(name: '**/bin/') - exclude(name: '**/classes/') - exclude(name: '**/platform/eclipse') - exclude(name: '**/platform/igd') - exclude(name: '**/platform/target') - exclude(name: '**/target/') -} - -def manifests(folders) { - ant.fileScanner { - folders.each { - fileset(dir: it) { - patternset(refid: 'manifests') - } - } - } -} - -def plugins(folders) { - ant.fileScanner { - folders.each { - fileset(dir: it) { - patternset(refid: 'plugins') - } - } - } -} - -def features(folders) { - ant.fileScanner { - folders.each { - fileset(dir: it) { - patternset(refid: 'features') - } - } - } -} - -def products(folders) { - ant.fileScanner { - folders.each { - fileset(dir: it) { - patternset(refid: 'products') - } - } - } -} - -def listVersions(folders = ['.'], doPrint = true) { - def vers = [:] - for (f in manifests(folders)) { - def fis = new FileInputStream(f) - def manifest = new Manifest(fis) - def attributes = manifest.getMainAttributes() - def name = attributes.getValue('Bundle-SymbolicName') - def ver = attributes.getValue('Bundle-Version') - if (vers[ver] == null) - vers[ver] = [] - vers[ver] += name - } - - for (f in features(folders)) { - def feature = new groovy.util.XmlSlurper().parse(f) - def name = feature.@id as String - def ver = feature.@version as String - if (vers[ver] == null) - vers[ver] = [] - vers[ver] += "(feature) $name" - } - - for (p in products(folders)) { - def product = new groovy.util.XmlSlurper().parse(p) - def name = product.@uid as String - def ver = product.@version as String - if (vers[ver] == null) - vers[ver] = [] - vers[ver] += '(product) ' + name - } - - if (doPrint) { - for (k in vers.sort()) { - println k.key + ':' - for (v in k.value) { - println ' ' + v - } - } - } - - vers -} - -def updateBundles(o, n, folders) { - println 'Replacing bundle versions ...' - println manifests(folders).iterator().toList().size() + ' MANIFEST.MF files found.' - folders.each { - ant.replace(dir: it, summary: true, token: "Bundle-Version: ${o}", value: "Bundle-Version: ${n}") { - patternset(refid: 'manifests') - } - } -} - -def updatePlugins(o, n, folders) { - println 'Replacing plugin versions ...' - println plugins(folders).iterator().toList().size() + ' plugin.xml files found.' - folders.each { - ant.replace(dir: it, summary: true, token: "Version ${o}", value: "Version ${n}") { - patternset(refid: 'plugins') - } - } -} - -def updateFeatures(o, n, folders) { - println 'Replacing feature versions ...' - println features(folders).iterator().toList().size() + ' feature.xml files found.' - for (f in features(folders)) { - // check if a replacement should be done for the feature - def feature = new XmlSlurper().parse(f) - def version = feature.@version as String - if (version.startsWith(o)) { - def newVersion - if (version == o) { - newVersion = n - } - else { - newVersion = n + version[o.length()..-1] - } - - // make sure to only replace the first occurrence - def fileText = f.text - f.text = fileText.replaceFirst(java.util.regex.Pattern.quote("version=\"$version\""), "version=\"$newVersion\"") - - println "Updated feature ${feature.@id}" - } - } -} - -def updateProducts(o, n, folders) { - println 'Replacing product versions ...' - println products(folders).iterator().toList().size() + ' product files found.' - folders.each { - ant.replace(dir: it, summary: true, token: "version=\"${o}", value: "version=\"${n}") { - patternset(refid: 'products') - } - } - folders.each { - ant.replace(dir: it, summary: true, token: "Version ${o}", value: "Version ${n}") { - patternset(refid: 'products') - } - } -} - -def update(o, n, changed) { - println "Old version: ${o}" - println "New version: ${n}" - - def folders = []; - def oldVersions = []; - - if (changed) { - println 'Updating only changed bundles / features' - println 'Checking for git...' - def gitVersion = "git --version".execute() - gitVersion.waitForProcessOutput() - if (gitVersion.exitValue() != 0) { - println 'Could not find git, exiting.' - return - } - - def gitDiff = "git diff --name-only ${o}".execute() - def changedFiles = gitDiff.text - if (gitDiff.exitValue() != 0) { - println "Diff against tag ${o} failed, exiting." - return - } - - println 'Looking for changed bundles / features...' - - Set paths = new LinkedHashSet() - Set ignoreChildren = ['.settings', '.project', '._project'].toSet() - - changedFiles.splitEachLine(/(\\|\/)/) { fileParts -> - int nameIndex = 0 - for (int i = 0; i < fileParts.size() && nameIndex == 0; i++) { - def part = fileParts[i] - switch(part) { - case 'plugins': - case 'features': - nameIndex = i+1 - break - } - } - - if (nameIndex > 0 && fileParts.size() > nameIndex) { - String name = fileParts[nameIndex] - - boolean ignore = (ignoreChildren.contains(fileParts[nameIndex+1])) - - if (!ignore) { - // build bundle / feature path - String path = fileParts[0..nameIndex].join(File.separator) - paths.add(path) - } - } - } - - if (paths) { - println 'Found the following changed bundles / features:' - for (path in paths) { - println path - // add to search folders - folders << path - } - } - else { - println 'No changed bundles or features found, exiting.' - return - } - - // look for current versions in changed bundles / features - def versions = listVersions(folders, false).keySet() - println 'with versions:' - versions.each { version -> - if (version.endsWith('.qualifier')) { - version = version[0..-('.qualifier'.length() + 1)] - } - println version - oldVersions << version - } - } - else { - // search in current folder - folders << '.' - // and only with the specified version - oldVersions << o - } - - oldVersions.each { - updateBundles(it, n, folders) - } - oldVersions.each { - updatePlugins(it, n, folders) - } - oldVersions.each { - updateFeatures(it, n, folders) - } - oldVersions.each { - updateProducts(it, n, folders) - } -} - -def updateApp(newVersion, release) { - // find application bundles - def dirs = (ant.fileScanner { - fileset(dir: '.') { - include name: '**/plugins/*.application' - } - }).directories().toList() - - if (dirs) { - println 'Identified application bundles:' - dirs.each { - println it - } - } - else { - println 'No application bundles found' - } - - // look for current versions in bundles - def versions = listVersions(dirs, false).keySet() - def oldVersions = [] - println 'with versions:' - versions.each { version -> - if (version.endsWith('.qualifier')) { - version = version[0..-('.qualifier'.length() + 1)] - } - println version - oldVersions << version - } - - // replace bundle versions - oldVersions.each { - updateBundles(it, newVersion, dirs) - updatePlugins(it, newVersion, dirs) - updateProducts(it, newVersion, dirs) - } - - // update build configuration - def buildConfig = new File('build/config.groovy') - - // find current version - def pattern = /version\s+=\s+'([^']+)'/ - def matcher = (buildConfig.text =~ pattern) - if (matcher) { - def oldVersion = matcher[0][1] - println "Old version in build config: $oldVersion" - def buildVersion = (release) ? (newVersion) : (newVersion + '-SNAPSHOT') - - // replace version - ant.replace(file: buildConfig, summary: true, token: "'${oldVersion}'", value: "'${buildVersion}'") - } - else { - println 'Could not detect version in build config' - } -} - -def cli = new CliBuilder(usage: 'updateversionnumbers.groovy [options]') -cli.with { - h longOpt: 'help', 'Show usage information' - l longOpt: 'list', 'List all plugins and features sorted by their respective version' - o longOpt: 'old', args: 1, argName: 'OLD', 'Old version number' - n longOpt: 'new', args: 1, argName: 'NEW', 'New version number' - _ longOpt: 'changed', 'Only update versions changed since the OLD version tag (use with -o and -n)' - _ longOpt: 'snapshot', args: 1, argName: 'VERSION', 'Set versions for application bundles and build to a snapshot version (cannot be combined with other options)' - _ longOpt: 'release', args: 1, argName: 'VERSION', 'Set versions for application bundles and build to a release version (cannot be combined with other options)' -} - -def options = cli.parse(args) -if (!options) { - cli.usage() - return -} - -if (options.h) { - cli.usage() - return -} - -if (options.l) { - listVersions() - return -} - -if (options.snapshot) { - updateApp(options.snapshot, false) - return -} - -if (options.release) { - updateApp(options.release, true) - return -} - -if (options.o && options.n) { - update(options.o, options.n, options.changed) - return -} - -cli.usage() diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.classpath b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.project b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.project deleted file mode 100644 index 9ef3b2e996..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - eu.esdihumboldt.util.groovy.meta.extension - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/edu.umd.cs.findbugs.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 993f6e6377..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Updated from default preferences Apr 11, 2014 12:49:56 PM -#Fri Apr 11 12:49:56 CEST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.core.resources.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 3f2d0f352d..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 15-Sep-2013 10:10:37 -#Sun Sep 15 10:10:37 CEST 2013 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.jdt.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f27049f484..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.jdt.groovy.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.jdt.launching.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index a5334099a4..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 15-Sep-2013 10:10:37 -#Sun Sep 15 10:10:37 CEST 2013 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.jdt.ui.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 2f62d8400a..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Updated from default preferences Jul 9, 2016 10:07:17 AM -#Sat Jul 09 10:07:17 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.pde.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 923c37fb8d..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.pde.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/META-INF/MANIFEST.MF deleted file mode 100644 index faa2f76c19..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/META-INF/MANIFEST.MF +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Groovy Meta Class Extension -Bundle-SymbolicName: eu.esdihumboldt.util.groovy.meta.extension;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0" -Import-Package: de.fhg.igd.eclipse.util.extension, - de.fhg.igd.eclipse.util.extension.simple -Export-Package: eu.esdihumboldt.util.groovy.meta.extension -Automatic-Module-Name: eu.esdihumboldt.util.groovy.meta.extension diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/build.gradle b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/build.gradle new file mode 100644 index 0000000000..2e3085c4a9 --- /dev/null +++ b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/build.gradle @@ -0,0 +1,15 @@ +plugins { + id 'hale.migrated-java' +} + +hale { + bundleName = 'Groovy Meta Class Extension' + + singletonBundle = true +} + +dependencies { + implementation libs.igd.eclipse.util + + testImplementation testLibs.junit4 +} diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/build.properties b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/build.properties deleted file mode 100644 index e9863e281e..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/plugin.xml b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/resources/main/plugin.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.groovy.meta.extension/plugin.xml rename to util/plugins/eu.esdihumboldt.util.groovy.meta.extension/resources/main/plugin.xml diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/schema/eu.esdihumboldt.util.groovy.meta.exsd b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/resources/main/schema/eu.esdihumboldt.util.groovy.meta.exsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.groovy.meta.extension/schema/eu.esdihumboldt.util.groovy.meta.exsd rename to util/plugins/eu.esdihumboldt.util.groovy.meta.extension/resources/main/schema/eu.esdihumboldt.util.groovy.meta.exsd diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.classpath b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.project b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.project deleted file mode 100644 index 427c6ae1cc..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - eu.esdihumboldt.util.groovy.meta.fragment - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/edu.umd.cs.findbugs.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 993f6e6377..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Updated from default preferences Apr 11, 2014 12:49:56 PM -#Fri Apr 11 12:49:56 CEST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.core.resources.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index c05218db95..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 15-Sep-2013 10:22:39 -#Sun Sep 15 10:22:39 CEST 2013 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.jdt.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f27049f484..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.jdt.groovy.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.jdt.launching.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 4260062f4f..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 15-Sep-2013 10:22:39 -#Sun Sep 15 10:22:39 CEST 2013 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.jdt.ui.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 2f62d8400a..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Updated from default preferences Jul 9, 2016 10:07:17 AM -#Sat Jul 09 10:07:17 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.pde.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index f29e940a00..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.pde.prefs b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/META-INF/MANIFEST.MF deleted file mode 100644 index b20f5b8e1a..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/META-INF/MANIFEST.MF +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Groovy Meta Class Extension Fragment -Bundle-SymbolicName: eu.esdihumboldt.util.groovy.meta.fragment -Bundle-Version: 5.4.0.qualifier -Fragment-Host: groovy;bundle-version="2.5.19" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: de.fhg.igd.eclipse.util.extension.simple, - eu.esdihumboldt.util.groovy.meta.extension -Automatic-Module-Name: eu.esdihumboldt.util.groovy.meta.fragment diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/build.gradle b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/build.gradle new file mode 100644 index 0000000000..40489bf815 --- /dev/null +++ b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/build.gradle @@ -0,0 +1,18 @@ +plugins { + id 'hale.migrated-java' +} + +hale { + bundleName = 'Groovy Meta Class Extension Fragment' + + fragmentHost = "groovy;bundle-version=\"${libs.versions.groovy.get()}\"" +} + +dependencies { + implementation project(':util:plugins:eu.esdihumboldt.util.groovy.meta.extension') + implementation libs.igd.eclipse.util + + compileOnly(libs.groovy.core) + + testImplementation testLibs.junit4 +} diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/build.properties b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/build.properties deleted file mode 100644 index 34d2e4d2da..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.classpath b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.project b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.project deleted file mode 100644 index a403897af0..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - eu.esdihumboldt.util.groovy.sandbox.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/edu.umd.cs.findbugs.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 993f6e6377..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Updated from default preferences Apr 11, 2014 12:49:56 PM -#Fri Apr 11 12:49:56 CEST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.core.resources.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 9aa06c1b6a..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 31.01.2014 17:13:03 -#Fri Jan 31 17:13:03 CET 2014 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.jdt.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f27049f484..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.jdt.groovy.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.jdt.launching.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index f0a0c82af9..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 31.01.2014 17:13:03 -#Fri Jan 31 17:13:03 CET 2014 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.jdt.ui.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 2f62d8400a..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Updated from default preferences Jul 9, 2016 10:07:17 AM -#Sat Jul 09 10:07:17 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.pde.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index b926f8c956..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 31.01.2014 17:13:03 -#Fri Jan 31 17:13:03 CET 2014 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.pde.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/META-INF/MANIFEST.MF deleted file mode 100644 index 4741fd6e00..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Groovy Interceptor Test -Bundle-SymbolicName: eu.esdihumboldt.util.groovy.sandbox.test -Bundle-Version: 5.4.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-ClassPath: . -Require-Bundle: groovy;bundle-version="2.5.19", - eu.esdihumboldt.cst.functions.groovy, - org.kohsuke.groovy.sandbox;bundle-version="1.5.0", - org.junit;bundle-version="4.13.0" -Import-Package: eu.esdihumboldt.hale.common.align.transformation.function, - eu.esdihumboldt.util.groovy.sandbox.internal -Automatic-Module-Name: eu.esdihumboldt.util.groovy.sandbox.test diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/build.properties b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/build.properties deleted file mode 100644 index 34d2e4d2da..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.classpath b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.project b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.project deleted file mode 100644 index ae429fa257..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - eu.esdihumboldt.util.groovy.sandbox - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/edu.umd.cs.findbugs.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index c04ea19b02..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Updated from default preferences Apr 11, 2014 12:49:53 PM -#Fri Apr 11 12:49:53 CEST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.core.resources.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 981a628275..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 19.02.2014 18:10:23 -#Wed Feb 19 18:10:23 CET 2014 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.jdt.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f27049f484..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.jdt.groovy.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.jdt.launching.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index a5d2fa3523..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 19.02.2014 18:10:23 -#Wed Feb 19 18:10:23 CET 2014 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.jdt.ui.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 2f62d8400a..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Updated from default preferences Jul 9, 2016 10:07:17 AM -#Sat Jul 09 10:07:17 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.pde.core.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 3230d0d1d7..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 19.02.2014 18:10:23 -#Wed Feb 19 18:10:23 CET 2014 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.pde.prefs b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/META-INF/MANIFEST.MF deleted file mode 100644 index 2ee3eb1a6b..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Groovy Sandbox -Bundle-SymbolicName: eu.esdihumboldt.util.groovy.sandbox;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: groovy;bundle-version="2.5.19", - org.kohsuke.groovy.sandbox;bundle-version="1.5.0" -Export-Package: eu.esdihumboldt.util.groovy.sandbox, - eu.esdihumboldt.util.groovy.sandbox.internal;x-internal:=true -Import-Package: de.fhg.igd.eclipse.util.extension, - javax.annotation;version="[1.2.0,1.2.0]", - org.eclipse.core.runtime;version="3.4.0" -Automatic-Module-Name: eu.esdihumboldt.util.groovy.sandbox diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/build.gradle b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/build.gradle new file mode 100644 index 0000000000..cd2e457c0c --- /dev/null +++ b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/build.gradle @@ -0,0 +1,24 @@ +plugins { + id 'hale.migrated-groovy' +} + +hale { + bundleName = 'Groovy Sandbox' + + singletonBundle = true +} + +dependencies { + implementation libs.groovy.core + implementation libs.groovy.sandbox + + implementation libs.igd.eclipse.util + implementation libs.eclipse.core.runtime + + testImplementation testLibs.junit4 + + /* + testImplementation project(':common:plugins:eu.esdihumboldt.hale.common.align') + testImplementation project(':cst:plugins:eu.esdihumboldt.cst.functions.groovy') + */ +} diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/build.properties b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/build.properties deleted file mode 100644 index e9863e281e..0000000000 --- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/plugin.xml b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/resources/main/plugin.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.groovy.sandbox/plugin.xml rename to util/plugins/eu.esdihumboldt.util.groovy.sandbox/resources/main/plugin.xml diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/schema/eu.esdihumboldt.util.groovy.sandbox.exsd b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/resources/main/schema/eu.esdihumboldt.util.groovy.sandbox.exsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.groovy.sandbox/schema/eu.esdihumboldt.util.groovy.sandbox.exsd rename to util/plugins/eu.esdihumboldt.util.groovy.sandbox/resources/main/schema/eu.esdihumboldt.util.groovy.sandbox.exsd diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/src/eu/esdihumboldt/util/groovy/sandbox/test/internal/GroovySandboxTest.java b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/test/eu/esdihumboldt/util/groovy/sandbox/test/internal/GroovySandboxTest.java similarity index 100% rename from util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/src/eu/esdihumboldt/util/groovy/sandbox/test/internal/GroovySandboxTest.java rename to util/plugins/eu.esdihumboldt.util.groovy.sandbox/test/eu/esdihumboldt/util/groovy/sandbox/test/internal/GroovySandboxTest.java diff --git a/util/plugins/eu.esdihumboldt.util.http/.classpath b/util/plugins/eu.esdihumboldt.util.http/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/util/plugins/eu.esdihumboldt.util.http/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/util/plugins/eu.esdihumboldt.util.http/.project b/util/plugins/eu.esdihumboldt.util.http/.project deleted file mode 100644 index e1a623182a..0000000000 --- a/util/plugins/eu.esdihumboldt.util.http/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - eu.esdihumboldt.util.http - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/util/plugins/eu.esdihumboldt.util.http/.settings/edu.umd.cs.findbugs.core.prefs b/util/plugins/eu.esdihumboldt.util.http/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 58ce6d564e..0000000000 --- a/util/plugins/eu.esdihumboldt.util.http/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.core.resources.prefs b/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index ff635dadef..0000000000 --- a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.jdt.core.prefs b/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f27049f484..0000000000 --- a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.jdt.groovy.core.prefs b/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.jdt.launching.prefs b/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 706de46d84..0000000000 --- a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.jdt.ui.prefs b/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 4b915ac0ae..0000000000 --- a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.pde.core.prefs b/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 5fca39f9f1..0000000000 --- a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Jul 21, 2016 1:52:32 PM -#Thu Jul 21 13:52:32 CEST 2016 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.pde.prefs b/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/util/plugins/eu.esdihumboldt.util.http/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/util/plugins/eu.esdihumboldt.util.http/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.http/META-INF/MANIFEST.MF deleted file mode 100644 index c8bf84f415..0000000000 --- a/util/plugins/eu.esdihumboldt.util.http/META-INF/MANIFEST.MF +++ /dev/null @@ -1,26 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Http Utilities -Bundle-SymbolicName: eu.esdihumboldt.util.http -Bundle-Version: 5.4.0.qualifier -Bundle-Vendor: wetransform GmbH -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.collect;version="27.0.0", - de.fhg.igd.slf4jplus, - eu.esdihumboldt.util, - eu.esdihumboldt.util.metrics, - io.prometheus.client;version="0.16.0", - org.apache.http;version="4.3.0";resolution:=optional, - org.apache.http.auth;version="4.3.0";resolution:=optional, - org.apache.http.client;version="4.3.0";resolution:=optional, - org.apache.http.client.fluent;version="4.3.0";resolution:=optional, - org.apache.http.conn;version="4.3.0";resolution:=optional, - org.apache.http.conn.routing;version="4.5.10", - org.apache.http.impl.client;version="4.3.0";resolution:=optional, - org.apache.http.impl.conn;version="4.3.0";resolution:=optional, - org.apache.http.pool;version="4.4.12", - org.slf4j;version="1.7.0" -Export-Package: eu.esdihumboldt.util.http, - eu.esdihumboldt.util.http.client, - eu.esdihumboldt.util.http.client.fluent -Automatic-Module-Name: eu.esdihumboldt.util.http diff --git a/util/plugins/eu.esdihumboldt.util.http/build.gradle b/util/plugins/eu.esdihumboldt.util.http/build.gradle new file mode 100644 index 0000000000..e84a09d62a --- /dev/null +++ b/util/plugins/eu.esdihumboldt.util.http/build.gradle @@ -0,0 +1,20 @@ +plugins { + id 'hale.migrated-java' +} + +hale { + bundleName = 'Http Utilities' +} + +dependencies { + implementation project(':util:plugins:eu.esdihumboldt.util') + + implementation project(':util:plugins:eu.esdihumboldt.util.metrics') + implementation libs.prometheus.client + + implementation libs.slf4jplus.api + + implementation libs.guava + implementation libs.apache.http.client + implementation libs.apache.http.fluent +} diff --git a/util/plugins/eu.esdihumboldt.util.http/build.properties b/util/plugins/eu.esdihumboldt.util.http/build.properties deleted file mode 100644 index 34d2e4d2da..0000000000 --- a/util/plugins/eu.esdihumboldt.util.http/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/util/plugins/eu.esdihumboldt.util.metrics/.classpath b/util/plugins/eu.esdihumboldt.util.metrics/.classpath deleted file mode 100644 index 3628e33687..0000000000 --- a/util/plugins/eu.esdihumboldt.util.metrics/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/util/plugins/eu.esdihumboldt.util.metrics/.project b/util/plugins/eu.esdihumboldt.util.metrics/.project deleted file mode 100644 index 9fcecf185a..0000000000 --- a/util/plugins/eu.esdihumboldt.util.metrics/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - eu.esdihumboldt.util.metrics - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/util/plugins/eu.esdihumboldt.util.metrics/.settings/edu.umd.cs.findbugs.core.prefs b/util/plugins/eu.esdihumboldt.util.metrics/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index b834241512..0000000000 --- a/util/plugins/eu.esdihumboldt.util.metrics/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Created from default preferences Oct 19, 2022 11:00:00 PM -#Wed Oct 19 23:00:00 CEST 2022 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.core.resources.prefs b/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index c0cad91d4e..0000000000 --- a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Oct 19, 2022 11:00:00 PM -#Wed Oct 19 23:00:00 CEST 2022 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.jdt.core.prefs b/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b1e936516b..0000000000 --- a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences Aug 24, 2023 2:24:31 PM -#Thu Aug 24 14:24:31 CEST 2023 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.jdt.groovy.core.prefs b/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index cbfeb8e835..0000000000 --- a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Aug 24, 2023 2:24:31 PM -#Thu Aug 24 14:24:31 CEST 2023 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.jdt.launching.prefs b/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 723aab14ba..0000000000 --- a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Oct 19, 2022 11:00:00 PM -#Wed Oct 19 23:00:00 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.jdt.ui.prefs b/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 5f39aca8b2..0000000000 --- a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Created from default preferences Oct 19, 2022 11:00:00 PM -#Wed Oct 19 23:00:00 CEST 2022 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.pde.core.prefs b/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 4ddaa9ff5c..0000000000 --- a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Oct 19, 2022 11:00:00 PM -#Wed Oct 19 23:00:00 CEST 2022 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.pde.prefs b/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 23c6f295cb..0000000000 --- a/util/plugins/eu.esdihumboldt.util.metrics/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Oct 19, 2022 11:00:00 PM -#Wed Oct 19 23:00:00 CEST 2022 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/util/plugins/eu.esdihumboldt.util.metrics/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.metrics/META-INF/MANIFEST.MF deleted file mode 100644 index a29cbe759d..0000000000 --- a/util/plugins/eu.esdihumboldt.util.metrics/META-INF/MANIFEST.MF +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Metrics API -Bundle-SymbolicName: eu.esdihumboldt.util.metrics -Bundle-Version: 5.4.0.qualifier -Bundle-Vendor: wetransform GmbH -Automatic-Module-Name: eu.esdihumboldt.util.metrics -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: io.prometheus.client;version="0.16.0" -Export-Package: eu.esdihumboldt.util.metrics diff --git a/util/plugins/eu.esdihumboldt.util.metrics/build.gradle b/util/plugins/eu.esdihumboldt.util.metrics/build.gradle new file mode 100644 index 0000000000..c77cff2360 --- /dev/null +++ b/util/plugins/eu.esdihumboldt.util.metrics/build.gradle @@ -0,0 +1,11 @@ +plugins { + id 'hale.migrated-java' +} + +hale { + bundleName = 'Metrics API' +} + +dependencies { + implementation libs.prometheus.client +} diff --git a/util/plugins/eu.esdihumboldt.util.metrics/build.properties b/util/plugins/eu.esdihumboldt.util.metrics/build.properties deleted file mode 100644 index 34d2e4d2da..0000000000 --- a/util/plugins/eu.esdihumboldt.util.metrics/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.classpath b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.classpath deleted file mode 100644 index 3628e33687..0000000000 --- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.project b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.project deleted file mode 100644 index 9c5f9f9105..0000000000 --- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - eu.esdihumboldt.util.orient.embedded.test - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/edu.umd.cs.findbugs.core.prefs b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index e49a3b97d4..0000000000 --- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Updated from default preferences Apr 11, 2014 12:49:57 PM -#Fri Apr 11 12:49:57 CEST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.core.resources.prefs b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 17c30cbdaf..0000000000 --- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 20.05.2011 09:41:38 -#Fri May 20 09:41:38 CEST 2011 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.jdt.core.prefs b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index db78538c83..0000000000 --- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,462 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.jdt.groovy.core.prefs b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.jdt.launching.prefs b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index a45e17ed33..0000000000 --- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 20.05.2011 09:41:38 -#Fri May 20 09:41:38 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.jdt.ui.prefs b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 2f62d8400a..0000000000 --- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Updated from default preferences Jul 9, 2016 10:07:17 AM -#Sat Jul 09 10:07:17 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.pde.core.prefs b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 9e7dedbe6a..0000000000 --- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Tue May 17 11:21:24 CEST 2011 -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.pde.prefs b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/META-INF/MANIFEST.MF deleted file mode 100644 index 3c2ccbba44..0000000000 --- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/META-INF/MANIFEST.MF +++ /dev/null @@ -1,10 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Embedded OrientDB Test Bundle -Bundle-SymbolicName: eu.esdihumboldt.util.orient.embedded.test -Bundle-Version: 5.4.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: com.orientechnologies.common;bundle-version="1.5.1", - com.orientechnologies.orientdb-core;bundle-version="1.5.1", - org.junit;bundle-version="4.13.0" -Automatic-Module-Name: eu.esdihumboldt.util.orient.embedded.test diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/build.gradle b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/build.gradle new file mode 100644 index 0000000000..26c473c5c4 --- /dev/null +++ b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/build.gradle @@ -0,0 +1,18 @@ +plugins { + id 'hale.migrated-java' +} + +hale { + bundleName = 'Embedded OrientDB Test Bundle' +} + +tasks.test { + jvmArgs = ['--add-exports', 'java.base/sun.nio.ch=ALL-UNNAMED'] +} + +dependencies { + testImplementation testLibs.junit4 + + testImplementation libs.orientdb.core + testImplementation libs.orient.common +} diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/build.properties b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/build.properties deleted file mode 100644 index 34d2e4d2da..0000000000 --- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - . diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/src/eu/esdihumboldt/util/orient/embedded/AbstractDocumentTest.java b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/test/eu/esdihumboldt/util/orient/embedded/AbstractDocumentTest.java similarity index 100% rename from util/plugins/eu.esdihumboldt.util.orient.embedded.test/src/eu/esdihumboldt/util/orient/embedded/AbstractDocumentTest.java rename to util/plugins/eu.esdihumboldt.util.orient.embedded.test/test/eu/esdihumboldt/util/orient/embedded/AbstractDocumentTest.java diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/src/eu/esdihumboldt/util/orient/embedded/BrowseClassIterateTest.java b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/test/eu/esdihumboldt/util/orient/embedded/BrowseClassIterateTest.java similarity index 100% rename from util/plugins/eu.esdihumboldt.util.orient.embedded.test/src/eu/esdihumboldt/util/orient/embedded/BrowseClassIterateTest.java rename to util/plugins/eu.esdihumboldt.util.orient.embedded.test/test/eu/esdihumboldt/util/orient/embedded/BrowseClassIterateTest.java diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/src/eu/esdihumboldt/util/orient/embedded/LocalDocumentTest.java b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/test/eu/esdihumboldt/util/orient/embedded/LocalDocumentTest.java similarity index 100% rename from util/plugins/eu.esdihumboldt.util.orient.embedded.test/src/eu/esdihumboldt/util/orient/embedded/LocalDocumentTest.java rename to util/plugins/eu.esdihumboldt.util.orient.embedded.test/test/eu/esdihumboldt/util/orient/embedded/LocalDocumentTest.java diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/src/eu/esdihumboldt/util/orient/embedded/MemoryDocumentTest.java b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/test/eu/esdihumboldt/util/orient/embedded/MemoryDocumentTest.java similarity index 100% rename from util/plugins/eu.esdihumboldt.util.orient.embedded.test/src/eu/esdihumboldt/util/orient/embedded/MemoryDocumentTest.java rename to util/plugins/eu.esdihumboldt.util.orient.embedded.test/test/eu/esdihumboldt/util/orient/embedded/MemoryDocumentTest.java diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/.classpath b/util/plugins/eu.esdihumboldt.util.prefixmapper/.classpath deleted file mode 100644 index e3378d07f0..0000000000 --- a/util/plugins/eu.esdihumboldt.util.prefixmapper/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/.project b/util/plugins/eu.esdihumboldt.util.prefixmapper/.project deleted file mode 100644 index 8704a9e57c..0000000000 --- a/util/plugins/eu.esdihumboldt.util.prefixmapper/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - eu.esdihumboldt.util.prefixmapper - - - - - - org.eclipse.jdt.core.javabuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/edu.umd.cs.findbugs.core.prefs b/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index 993f6e6377..0000000000 --- a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Updated from default preferences Apr 11, 2014 12:49:56 PM -#Fri Apr 11 12:49:56 CEST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.core.resources.prefs b/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 17c30cbdaf..0000000000 --- a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 20.05.2011 09:41:38 -#Fri May 20 09:41:38 CEST 2011 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.jdt.core.prefs b/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 4a614698f9..0000000000 --- a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,458 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.APILeak=warning -org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning -org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled -org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.jdt.groovy.core.prefs b/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.jdt.launching.prefs b/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index a45e17ed33..0000000000 --- a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 20.05.2011 09:41:38 -#Fri May 20 09:41:38 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.jdt.ui.prefs b/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 2f62d8400a..0000000000 --- a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Updated from default preferences Jul 9, 2016 10:07:17 AM -#Sat Jul 09 10:07:17 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.pde.core.prefs b/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 3487e7635c..0000000000 --- a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences Nov 7, 2012 11:02:23 AM -#Wed Nov 07 11:02:23 CET 2012 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.pde.prefs b/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/util/plugins/eu.esdihumboldt.util.prefixmapper/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.prefixmapper/META-INF/MANIFEST.MF deleted file mode 100644 index e48ced1422..0000000000 --- a/util/plugins/eu.esdihumboldt.util.prefixmapper/META-INF/MANIFEST.MF +++ /dev/null @@ -1,9 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: HALE Prefix Mapper -Bundle-SymbolicName: eu.esdihumboldt.hale.prefixmapper -Bundle-Version: 1.0.1 -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: eu.esdihumboldt.hale.prefixmapper -Require-Bundle: com.sun.xml.bind.jaxb-impl;bundle-version="4.0.1" - diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/README b/util/plugins/eu.esdihumboldt.util.prefixmapper/README deleted file mode 100644 index 13d2285378..0000000000 --- a/util/plugins/eu.esdihumboldt.util.prefixmapper/README +++ /dev/null @@ -1,15 +0,0 @@ -NamespacePrefixMapper for HALE - -The JRE provides JAXB, which is exported by the system bundle. Because the HALE -plugin already has a dependency to the system bundle (OSGi framework) it can't -use the JAXB provided by the target platform. -This poses a problem when using the NamespacePrefixMapper from the Humboldt -Common Library, which references a class that is only present in the target -platform's JAXB implementation (com.sun.xml.bind.marshaller.NamespacePrefixMapper). -Using this class results in a conflict, so the corresponding class in the JRE -must be used (com.sun.xml.internal.bind.marshaller.NamespacePrefixMapper). -Because access to this class is restricted, this Eclipse project has to be -a normal Java project instead of a PDE project. -Because there may still be issues compiling this project in Eclipse, this bundle -is also provided pre-compiled in the target platform. Therefore it need not be -imported into the workspace. \ No newline at end of file diff --git a/util/plugins/eu.esdihumboldt.util.prefixmapper/build.gradle b/util/plugins/eu.esdihumboldt.util.prefixmapper/build.gradle new file mode 100644 index 0000000000..cad24feb51 --- /dev/null +++ b/util/plugins/eu.esdihumboldt.util.prefixmapper/build.gradle @@ -0,0 +1,11 @@ +plugins { + id 'hale.migrated-java' +} + +hale { + bundleName = 'HALE Prefix Mapper' +} + +dependencies { + implementation libs.jaxb.runtime +} diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/.project b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/.project deleted file mode 100644 index 24249befb6..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/.project +++ /dev/null @@ -1,22 +0,0 @@ - - - eu.esdihumboldt.util.resource.schemas.inspire.annex1 - - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - - diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/.settings/org.eclipse.pde.core.prefs b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index f29e940a00..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/build.gradle b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/build.gradle new file mode 100644 index 0000000000..3783df4dc3 --- /dev/null +++ b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'hale.migrated-java' +} + +hale { + bundleName = 'Bundled Inspire Annex I Schemas' + singletonBundle = true +} + +dependencies { + implementation project(':util:plugins:eu.esdihumboldt.util.resource') + + api resJars.schemas.ogc +} diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/build.properties b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/build.properties deleted file mode 100644 index ce520221e9..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -bin.includes = META-INF/,\ - plugin.xml,\ - icons/,\ - annex1/ diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/Addresses.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/Addresses.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/Addresses.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/Addresses.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/AdministrativeUnits.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/AdministrativeUnits.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/AdministrativeUnits.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/AdministrativeUnits.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/AirTransportNetwork.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/AirTransportNetwork.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/AirTransportNetwork.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/AirTransportNetwork.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/BaseTypes.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/BaseTypes.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/BaseTypes.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/BaseTypes.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/BiogeographicalRegions.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/BiogeographicalRegions.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/BiogeographicalRegions.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/BiogeographicalRegions.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/Buildings.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/Buildings.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/Buildings.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/Buildings.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/CableTransportNetwork.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/CableTransportNetwork.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/CableTransportNetwork.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/CableTransportNetwork.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/CadastralParcels.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/CadastralParcels.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/CadastralParcels.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/CadastralParcels.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/CommonTransportElements.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/CommonTransportElements.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/CommonTransportElements.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/CommonTransportElements.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/EnergyResources.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/EnergyResources.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/EnergyResources.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/EnergyResources.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/Gazetteer.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/Gazetteer.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/Gazetteer.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/Gazetteer.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/GeographicalNames.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/GeographicalNames.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/GeographicalNames.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/GeographicalNames.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/Geology.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/Geology.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/Geology.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/Geology.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/HabitatsAndBiotopes.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/HabitatsAndBiotopes.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/HabitatsAndBiotopes.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/HabitatsAndBiotopes.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/HydroBase.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/HydroBase.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/HydroBase.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/HydroBase.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/HydroNetwork.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/HydroNetwork.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/HydroNetwork.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/HydroNetwork.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/HydroPhysicalWaters.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/HydroPhysicalWaters.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/HydroPhysicalWaters.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/HydroPhysicalWaters.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/HydroReporting.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/HydroReporting.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/HydroReporting.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/HydroReporting.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/LandCover.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/LandCover.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/LandCover.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/LandCover.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/NaturalRiskZones.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/NaturalRiskZones.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/NaturalRiskZones.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/NaturalRiskZones.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/Network.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/Network.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/Network.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/Network.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/ProtectedSites.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/ProtectedSites.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/ProtectedSites.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/ProtectedSites.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/ProtectedSitesFull.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/ProtectedSitesFull.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/ProtectedSitesFull.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/ProtectedSitesFull.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/ProtectedSitesNatura2000.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/ProtectedSitesNatura2000.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/ProtectedSitesNatura2000.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/ProtectedSitesNatura2000.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/RailwayTransportNetwork.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/RailwayTransportNetwork.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/RailwayTransportNetwork.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/RailwayTransportNetwork.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/RoadTransportNetwork.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/RoadTransportNetwork.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/RoadTransportNetwork.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/RoadTransportNetwork.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/SeaRegions.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/SeaRegions.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/SeaRegions.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/SeaRegions.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/SpeciesDistribution.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/SpeciesDistribution.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/SpeciesDistribution.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/SpeciesDistribution.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/StatisticalUnits.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/StatisticalUnits.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/StatisticalUnits.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/StatisticalUnits.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/UtilityAndGovernmentalServices.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/UtilityAndGovernmentalServices.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/UtilityAndGovernmentalServices.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/UtilityAndGovernmentalServices.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/WaterFrameworkDirective.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/WaterFrameworkDirective.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/WaterFrameworkDirective.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/WaterFrameworkDirective.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/WaterTransportNetwork.xsd b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/WaterTransportNetwork.xsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/3.0/WaterTransportNetwork.xsd rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/3.0/WaterTransportNetwork.xsd diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AccessRestrictionValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AccessRestrictionValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AccessRestrictionValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AccessRestrictionValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/ActivityValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/ActivityValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/ActivityValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/ActivityValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AdministrativeHierarchyLevel.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AdministrativeHierarchyLevel.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AdministrativeHierarchyLevel.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AdministrativeHierarchyLevel.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AerodromeCategoryValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AerodromeCategoryValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AerodromeCategoryValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AerodromeCategoryValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AerodromeTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AerodromeTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AerodromeTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AerodromeTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AirRouteLinkClassValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AirRouteLinkClassValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AirRouteLinkClassValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AirRouteLinkClassValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AirRouteTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AirRouteTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AirRouteTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AirRouteTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AirUseRestrictionValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AirUseRestrictionValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AirUseRestrictionValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AirUseRestrictionValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AirspaceAreaTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AirspaceAreaTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AirspaceAreaTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AirspaceAreaTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AreaConditionValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AreaConditionValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/AreaConditionValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/AreaConditionValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/CablewayTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/CablewayTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/CablewayTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/CablewayTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/CadastralZoningLevelValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/CadastralZoningLevelValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/CadastralZoningLevelValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/CadastralZoningLevelValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/ConditionOfFacilityValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/ConditionOfFacilityValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/ConditionOfFacilityValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/ConditionOfFacilityValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/ConnectionTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/ConnectionTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/ConnectionTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/ConnectionTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/CountryCode.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/CountryCode.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/CountryCode.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/CountryCode.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/CrossingTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/CrossingTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/CrossingTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/CrossingTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/DesignationSchemeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/DesignationSchemeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/DesignationSchemeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/DesignationSchemeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/DesignationValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/DesignationValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/DesignationValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/DesignationValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/EmeraldNetworkDesignationValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/EmeraldNetworkDesignationValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/EmeraldNetworkDesignationValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/EmeraldNetworkDesignationValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/FerryUseValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/FerryUseValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/FerryUseValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/FerryUseValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/FormOfRailwayNodeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/FormOfRailwayNodeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/FormOfRailwayNodeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/FormOfRailwayNodeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/FormOfRoadNodeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/FormOfRoadNodeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/FormOfRoadNodeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/FormOfRoadNodeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/FormOfWaterwayNodeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/FormOfWaterwayNodeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/FormOfWaterwayNodeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/FormOfWaterwayNodeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/FormOfWayValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/FormOfWayValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/FormOfWayValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/FormOfWayValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/FundingTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/FundingTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/FundingTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/FundingTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/GeometryMethodValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/GeometryMethodValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/GeometryMethodValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/GeometryMethodValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/GeometrySpecificationValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/GeometrySpecificationValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/GeometrySpecificationValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/GeometrySpecificationValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/GrammaticalGenderValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/GrammaticalGenderValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/GrammaticalGenderValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/GrammaticalGenderValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/GrammaticalNumberValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/GrammaticalNumberValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/GrammaticalNumberValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/GrammaticalNumberValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/HabitatTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/HabitatTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/HabitatTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/HabitatTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/HydroNodeCategoryValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/HydroNodeCategoryValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/HydroNodeCategoryValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/HydroNodeCategoryValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/HydrologicalPersistenceValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/HydrologicalPersistenceValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/HydrologicalPersistenceValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/HydrologicalPersistenceValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/IUCNDesignationValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/IUCNDesignationValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/IUCNDesignationValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/IUCNDesignationValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/IdentificationType.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/IdentificationType.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/IdentificationType.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/IdentificationType.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/InundationValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/InundationValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/InundationValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/InundationValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/LinkDirectionValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/LinkDirectionValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/LinkDirectionValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/LinkDirectionValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/LocatorDesignatorTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/LocatorDesignatorTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/LocatorDesignatorTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/LocatorDesignatorTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/LocatorLevelValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/LocatorLevelValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/LocatorLevelValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/LocatorLevelValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/LocatorNameTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/LocatorNameTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/LocatorNameTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/LocatorNameTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/NameStatusValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/NameStatusValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/NameStatusValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/NameStatusValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/NamedPlaceTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/NamedPlaceTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/NamedPlaceTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/NamedPlaceTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/NationalMonumentsRecordDesignationValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/NationalMonumentsRecordDesignationValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/NationalMonumentsRecordDesignationValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/NationalMonumentsRecordDesignationValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/NativenessValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/NativenessValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/NativenessValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/NativenessValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/Natura2000DesignationValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/Natura2000DesignationValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/Natura2000DesignationValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/Natura2000DesignationValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/NavaidTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/NavaidTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/NavaidTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/NavaidTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/PartTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/PartTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/PartTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/PartTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/PointRoleValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/PointRoleValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/PointRoleValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/PointRoleValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RailwayTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RailwayTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RailwayTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RailwayTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RailwayUseValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RailwayUseValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RailwayUseValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RailwayUseValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RamsarDesignationValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RamsarDesignationValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RamsarDesignationValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RamsarDesignationValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RegionClassificationValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RegionClassificationValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RegionClassificationValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RegionClassificationValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RestrictionTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RestrictionTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RestrictionTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RestrictionTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RoadPartValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RoadPartValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RoadPartValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RoadPartValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RoadServiceTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RoadServiceTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RoadServiceTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RoadServiceTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RoadSurfaceCategoryValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RoadSurfaceCategoryValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RoadSurfaceCategoryValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RoadSurfaceCategoryValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RunwayTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RunwayTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/RunwayTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/RunwayTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/ServiceFacilityValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/ServiceFacilityValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/ServiceFacilityValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/ServiceFacilityValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/ShoreTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/ShoreTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/ShoreTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/ShoreTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/SiteIdentifierSchemeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/SiteIdentifierSchemeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/SiteIdentifierSchemeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/SiteIdentifierSchemeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/SpeciesTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/SpeciesTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/SpeciesTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/SpeciesTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/SpeedLimitSourceValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/SpeedLimitSourceValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/SpeedLimitSourceValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/SpeedLimitSourceValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/StatusValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/StatusValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/StatusValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/StatusValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/SurfaceCompositionValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/SurfaceCompositionValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/SurfaceCompositionValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/SurfaceCompositionValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/UNESCOManAndBiosphereProgrammeDesignationValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/UNESCOManAndBiosphereProgrammeDesignationValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/UNESCOManAndBiosphereProgrammeDesignationValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/UNESCOManAndBiosphereProgrammeDesignationValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/UNESCOWorldHeritageDesignationValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/UNESCOWorldHeritageDesignationValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/UNESCOWorldHeritageDesignationValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/UNESCOWorldHeritageDesignationValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/VehicleTypeValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/VehicleTypeValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/VehicleTypeValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/VehicleTypeValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/VoidReasonValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/VoidReasonValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/VoidReasonValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/VoidReasonValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/WaterLevelValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/WaterLevelValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/WaterLevelValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/WaterLevelValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/WeatherConditionValue.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/WeatherConditionValue.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/codelists/WeatherConditionValue.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/codelists/WeatherConditionValue.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/projects/HydroPhysicalWaters.halex b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/projects/HydroPhysicalWaters.halex similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/projects/HydroPhysicalWaters.halex rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/projects/HydroPhysicalWaters.halex diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/projects/HydroPhysicalWaters.halex.alignment.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/projects/HydroPhysicalWaters.halex.alignment.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/projects/HydroPhysicalWaters.halex.alignment.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/projects/HydroPhysicalWaters.halex.alignment.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/projects/HydroPhysicalWaters.halex.styles.sld b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/projects/HydroPhysicalWaters.halex.styles.sld similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/annex1/projects/HydroPhysicalWaters.halex.styles.sld rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/annex1/projects/HydroPhysicalWaters.halex.styles.sld diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/icons/inspire.gif b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/icons/inspire.gif similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/icons/inspire.gif rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/icons/inspire.gif diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/plugin.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/plugin.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/plugin.xml rename to util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/resources/main/plugin.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource/.classpath b/util/plugins/eu.esdihumboldt.util.resource/.classpath deleted file mode 100644 index 81fe078c20..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/util/plugins/eu.esdihumboldt.util.resource/.project b/util/plugins/eu.esdihumboldt.util.resource/.project deleted file mode 100644 index f4b8f4d8e5..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - eu.esdihumboldt.util.resource - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/util/plugins/eu.esdihumboldt.util.resource/.settings/edu.umd.cs.findbugs.core.prefs b/util/plugins/eu.esdihumboldt.util.resource/.settings/edu.umd.cs.findbugs.core.prefs deleted file mode 100644 index e49a3b97d4..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource/.settings/edu.umd.cs.findbugs.core.prefs +++ /dev/null @@ -1,132 +0,0 @@ -#Updated from default preferences Apr 11, 2014 12:49:57 PM -#Fri Apr 11 12:49:57 CEST 2014 -cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud -detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true -detectorAtomicityProblem=AtomicityProblem|true -detectorBadAppletConstructor=BadAppletConstructor|false -detectorBadResultSetAccess=BadResultSetAccess|true -detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true -detectorBadUseOfReturnValue=BadUseOfReturnValue|true -detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true -detectorBooleanReturnNull=BooleanReturnNull|true -detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true -detectorCheckExpectedWarnings=CheckExpectedWarnings|false -detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true -detectorCheckTypeQualifiers=CheckTypeQualifiers|true -detectorCloneIdiom=CloneIdiom|true -detectorComparatorIdiom=ComparatorIdiom|true -detectorConfusedInheritance=ConfusedInheritance|true -detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true -detectorCrossSiteScripting=CrossSiteScripting|true -detectorDefaultEncodingDetector=DefaultEncodingDetector|true -detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true -detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true -detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true -detectorDontUseEnum=DontUseEnum|true -detectorDroppedException=DroppedException|true -detectorDumbMethodInvocations=DumbMethodInvocations|true -detectorDumbMethods=DumbMethods|true -detectorDuplicateBranches=DuplicateBranches|true -detectorEmptyZipFileEntry=EmptyZipFileEntry|true -detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true -detectorExplicitSerialization=ExplicitSerialization|true -detectorFinalizerNullsFields=FinalizerNullsFields|true -detectorFindBadCast2=FindBadCast2|true -detectorFindBadForLoop=FindBadForLoop|true -detectorFindCircularDependencies=FindCircularDependencies|false -detectorFindDeadLocalStores=FindDeadLocalStores|true -detectorFindDoubleCheck=FindDoubleCheck|true -detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true -detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true -detectorFindFinalizeInvocations=FindFinalizeInvocations|true -detectorFindFloatEquality=FindFloatEquality|true -detectorFindHEmismatch=FindHEmismatch|true -detectorFindInconsistentSync2=FindInconsistentSync2|true -detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true -detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true -detectorFindMaskedFields=FindMaskedFields|true -detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true -detectorFindNakedNotify=FindNakedNotify|true -detectorFindNonShortCircuit=FindNonShortCircuit|true -detectorFindNullDeref=FindNullDeref|true -detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true -detectorFindOpenStream=FindOpenStream|true -detectorFindPuzzlers=FindPuzzlers|true -detectorFindRefComparison=FindRefComparison|true -detectorFindReturnRef=FindReturnRef|true -detectorFindRunInvocations=FindRunInvocations|true -detectorFindSelfComparison=FindSelfComparison|true -detectorFindSelfComparison2=FindSelfComparison2|true -detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true -detectorFindSpinLoop=FindSpinLoop|true -detectorFindSqlInjection=FindSqlInjection|true -detectorFindTwoLockWait=FindTwoLockWait|true -detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true -detectorFindUnconditionalWait=FindUnconditionalWait|true -detectorFindUninitializedGet=FindUninitializedGet|true -detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true -detectorFindUnreleasedLock=FindUnreleasedLock|true -detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true -detectorFindUnsyncGet=FindUnsyncGet|true -detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true -detectorFindUselessControlFlow=FindUselessControlFlow|true -detectorFormatStringChecker=FormatStringChecker|true -detectorHugeSharedStringConstants=HugeSharedStringConstants|true -detectorIDivResultCastToDouble=IDivResultCastToDouble|true -detectorIncompatMask=IncompatMask|true -detectorInconsistentAnnotations=InconsistentAnnotations|true -detectorInefficientMemberAccess=InefficientMemberAccess|false -detectorInefficientToArray=InefficientToArray|true -detectorInfiniteLoop=InfiniteLoop|true -detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true -detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true -detectorInitializationChain=InitializationChain|true -detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true -detectorInstantiateStaticClass=InstantiateStaticClass|true -detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true -detectorInvalidJUnitTest=InvalidJUnitTest|true -detectorIteratorIdioms=IteratorIdioms|true -detectorLazyInit=LazyInit|true -detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true -detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true -detectorMethodReturnCheck=MethodReturnCheck|true -detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true -detectorMutableLock=MutableLock|true -detectorMutableStaticFields=MutableStaticFields|true -detectorNaming=Naming|true -detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true -detectorNumberConstructor=NumberConstructor|true -detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true -detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true -detectorPublicSemaphores=PublicSemaphores|true -detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true -detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true -detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true -detectorRedundantInterfaces=RedundantInterfaces|true -detectorRepeatedConditionals=RepeatedConditionals|true -detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true -detectorSerializableIdiom=SerializableIdiom|true -detectorStartInConstructor=StartInConstructor|true -detectorStaticCalendarDetector=StaticCalendarDetector|true -detectorStringConcatenation=StringConcatenation|true -detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true -detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true -detectorSwitchFallthrough=SwitchFallthrough|true -detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true -detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true -detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true -detectorURLProblems=URLProblems|true -detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true -detectorUnnecessaryMath=UnnecessaryMath|true -detectorUnreadFields=UnreadFields|true -detectorUselessSubclassMethod=UselessSubclassMethod|true -detectorVarArgsProblems=VarArgsProblems|true -detectorVolatileUsage=VolatileUsage|true -detectorWaitInLoop=WaitInLoop|true -detectorWrongMapIterator=WrongMapIterator|true -detectorXMLFactoryBypass=XMLFactoryBypass|true -detector_threshold=2 -effort=default -filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15 -filter_settings_neg=NOISE,EXPERIMENTAL| -run_at_full_build=false diff --git a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.core.resources.prefs b/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 6799254704..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 10.02.2012 22:54:19 -#Fri Feb 10 22:54:19 CET 2012 -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.jdt.core.prefs b/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index f27049f484..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,424 +0,0 @@ -#Updated from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -org.eclipse.jdt.core.builder.cleanOutputFolder=clean -org.eclipse.jdt.core.builder.duplicateResourceTask=warning -org.eclipse.jdt.core.builder.invalidClasspath=abort -org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore -org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/ -org.eclipse.jdt.core.circularClasspath=error -org.eclipse.jdt.core.classpath.exclusionPatterns=enabled -org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled -org.eclipse.jdt.core.codeComplete.argumentPrefixes= -org.eclipse.jdt.core.codeComplete.argumentSuffixes= -org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_ -org.eclipse.jdt.core.codeComplete.fieldSuffixes= -org.eclipse.jdt.core.codeComplete.localPrefixes= -org.eclipse.jdt.core.codeComplete.localSuffixes= -org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes= -org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.doc.comment.support=enabled -org.eclipse.jdt.core.compiler.maxProblemPerUnit=100 -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=warning -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning -org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled -org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected -org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags -org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled -org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning -org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=100 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.incompatibleJDKLevel=ignore -org.eclipse.jdt.core.incompleteClasspath=error diff --git a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.jdt.groovy.core.prefs b/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.jdt.groovy.core.prefs deleted file mode 100644 index a7489239bd..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.jdt.groovy.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 28 Oct 2022, 08:10:30 -#Fri Oct 28 08:10:30 CEST 2022 -eclipse.preferences.version=1 -groovy.compiler.level=25 diff --git a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.jdt.launching.prefs b/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.jdt.launching.prefs deleted file mode 100644 index 2c2096198f..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.jdt.launching.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Created from default preferences 10.02.2012 22:54:19 -#Fri Feb 10 22:54:19 CET 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore diff --git a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.jdt.ui.prefs b/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 2f62d8400a..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,64 +0,0 @@ -#Updated from default preferences Jul 9, 2016 10:07:17 AM -#Sat Jul 09 10:07:17 CEST 2016 -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=_HALE -formatter_settings_version=12 -org.eclipse.jdt.ui.exception.name=e -org.eclipse.jdt.ui.gettersetter.use.is=true -org.eclipse.jdt.ui.javadoc=true -org.eclipse.jdt.ui.keywordthis=false -org.eclipse.jdt.ui.overrideannotation=true -org.eclipse.jdt.ui.text.custom_code_templates= -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.make_local_variable_final=false -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=true -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.pde.core.prefs b/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index f7d766fc3c..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Fri Feb 10 22:55:24 CET 2012 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.pde.prefs b/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.pde.prefs deleted file mode 100644 index fae5965fb0..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,36 +0,0 @@ -#Created from default preferences Jul 25, 2018 1:58:36 PM -#Wed Jul 25 13:58:36 CEST 2018 -compilers.f.unresolved-features=1 -compilers.f.unresolved-plugins=1 -compilers.incompatible-environment=2 -compilers.p.build=1 -compilers.p.build.bin.includes=1 -compilers.p.build.encodings=2 -compilers.p.build.java.compiler=2 -compilers.p.build.java.compliance=1 -compilers.p.build.missing.output=2 -compilers.p.build.output.library=1 -compilers.p.build.source.library=1 -compilers.p.build.src.includes=1 -compilers.p.deprecated=1 -compilers.p.discouraged-class=1 -compilers.p.internal=1 -compilers.p.missing-packages=2 -compilers.p.missing-version-export-package=2 -compilers.p.missing-version-import-package=2 -compilers.p.missing-version-require-bundle=2 -compilers.p.no-required-att=0 -compilers.p.no.automatic.module=1 -compilers.p.not-externalized-att=2 -compilers.p.service.component.without.lazyactivation=1 -compilers.p.unknown-attribute=1 -compilers.p.unknown-class=1 -compilers.p.unknown-element=1 -compilers.p.unknown-identifier=1 -compilers.p.unknown-resource=1 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.s.create-docs=false -compilers.s.doc-folder=doc -compilers.s.open-tags=1 -eclipse.preferences.version=1 diff --git a/util/plugins/eu.esdihumboldt.util.resource/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.resource/META-INF/MANIFEST.MF deleted file mode 100644 index a954dc8e10..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource/META-INF/MANIFEST.MF +++ /dev/null @@ -1,18 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Resource Utilities -Bundle-SymbolicName: eu.esdihumboldt.util.resource;singleton:=true -Bundle-Version: 5.4.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: com.google.common.collect;version="9.0.0", - de.fhg.igd.slf4jplus, - eu.esdihumboldt.util.io, - org.apache.commons.io, - org.slf4j;version="1.5.11" -Require-Bundle: de.fhg.igd.eclipse.util;bundle-version="1.0.0", - org.eclipse.core.runtime;bundle-version="3.7.0" -Bundle-Activator: eu.esdihumboldt.util.resource.internal.ResourceBundle -Bundle-ActivationPolicy: lazy -Export-Package: eu.esdihumboldt.util.resource, - eu.esdihumboldt.util.resource.internal;x-internal:=true -Automatic-Module-Name: eu.esdihumboldt.util.resource diff --git a/util/plugins/eu.esdihumboldt.util.resource/build.gradle b/util/plugins/eu.esdihumboldt.util.resource/build.gradle new file mode 100644 index 0000000000..90a9367945 --- /dev/null +++ b/util/plugins/eu.esdihumboldt.util.resource/build.gradle @@ -0,0 +1,21 @@ +plugins { + id 'hale.migrated-java' +} + +hale { + bundleName = 'Resource Utilities' + + activator = 'eu.esdihumboldt.util.resource.internal.ResourceBundle' + lazyActivation = true + + singletonBundle = true +} + +dependencies { + implementation libs.guava + implementation libs.slf4jplus.api + implementation libs.commons.io + implementation libs.igd.eclipse.util + + implementation project(':util:plugins:eu.esdihumboldt.util') +} diff --git a/util/plugins/eu.esdihumboldt.util.resource/build.properties b/util/plugins/eu.esdihumboldt.util.resource/build.properties deleted file mode 100644 index 3595411e85..0000000000 --- a/util/plugins/eu.esdihumboldt.util.resource/build.properties +++ /dev/null @@ -1,6 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - schema/ diff --git a/util/plugins/eu.esdihumboldt.util.resource/plugin.xml b/util/plugins/eu.esdihumboldt.util.resource/resources/main/plugin.xml similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource/plugin.xml rename to util/plugins/eu.esdihumboldt.util.resource/resources/main/plugin.xml diff --git a/util/plugins/eu.esdihumboldt.util.resource/schema/eu.esdihumboldt.util.resource.exsd b/util/plugins/eu.esdihumboldt.util.resource/resources/main/schema/eu.esdihumboldt.util.resource.exsd similarity index 100% rename from util/plugins/eu.esdihumboldt.util.resource/schema/eu.esdihumboldt.util.resource.exsd rename to util/plugins/eu.esdihumboldt.util.resource/resources/main/schema/eu.esdihumboldt.util.resource.exsd