aboutsummaryrefslogtreecommitdiff
path: root/common/.settings
diff options
context:
space:
mode:
authorAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2013-09-04 09:37:31 +0200
committerAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2013-09-04 09:37:31 +0200
commiteadd6dd97f1b30608b31ffcd90382874fbcdaddc (patch)
tree1e02de018bcb417bf897f06fb79bf64eda9b4b06 /common/.settings
parent61362f940ca679fe215de34b1683e1110fea8d3e (diff)
parent69f2dfdf3e0b5d976df3cdece6a8ead4848d746a (diff)
downloadmoa-id-spss-eadd6dd97f1b30608b31ffcd90382874fbcdaddc.tar.gz
moa-id-spss-eadd6dd97f1b30608b31ffcd90382874fbcdaddc.tar.bz2
moa-id-spss-eadd6dd97f1b30608b31ffcd90382874fbcdaddc.zip
Merge SPSS
Diffstat (limited to 'common/.settings')
-rw-r--r--common/.settings/org.eclipse.jdt.core.prefs12
-rw-r--r--common/.settings/org.eclipse.wst.common.component2
2 files changed, 6 insertions, 8 deletions
diff --git a/common/.settings/org.eclipse.jdt.core.prefs b/common/.settings/org.eclipse.jdt.core.prefs
index 926e77f2f..1cd6f082c 100644
--- a/common/.settings/org.eclipse.jdt.core.prefs
+++ b/common/.settings/org.eclipse.jdt.core.prefs
@@ -1,13 +1,9 @@
-#Thu Dec 27 15:45:20 CET 2012
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+#Mon Aug 05 10:52:30 CEST 2013
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.compliance=1.5
diff --git a/common/.settings/org.eclipse.wst.common.component b/common/.settings/org.eclipse.wst.common.component
index 386d0ebba..0b1b59ec8 100644
--- a/common/.settings/org.eclipse.wst.common.component
+++ b/common/.settings/org.eclipse.wst.common.component
@@ -2,5 +2,7 @@
<wb-module deploy-name="moa-common">
<wb-resource deploy-path="/" source-path="src/main/java"/>
<wb-resource deploy-path="/" source-path="src/main/resources"/>
+ <wb-resource deploy-path="/" source-path="/src/main/java"/>
+ <wb-resource deploy-path="/" source-path="/src/main/resources"/>
</wb-module>
</project-modules>