diff --git a/README.md b/README.md index a52a607217..22cc6c8e17 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ ant clean run ## Developing with Eclipse -Download Eclipse Oxygen 4.7.1a or later from http://download.eclipse.org/eclipse/downloads/ +Download "Eclipse for Java Developers" from https://www.eclipse.org/downloads/packages/ Start Eclipse like this: @@ -85,6 +85,10 @@ Check Eclipse Preferences: ### Use plain Java configuration +This approach uses the Eclipse-specific `.classpath` and `.project` files, +which may lag the maven-based settings or be incomplete, +but for the time being can still be used. + Use `File`, `Import`, `General`, `Existing Projects into Workspace`. Select the phoebus root directory, and check the option to "Search for nested projects". diff --git a/app/3d-viewer/.classpath b/app/3d-viewer/.classpath index fe989b0824..aaa84ebe72 100644 --- a/app/3d-viewer/.classpath +++ b/app/3d-viewer/.classpath @@ -10,6 +10,6 @@ - + diff --git a/app/alarm/datasource/.classpath b/app/alarm/datasource/.classpath index 8848f1c344..4cdc252880 100644 --- a/app/alarm/datasource/.classpath +++ b/app/alarm/datasource/.classpath @@ -8,7 +8,7 @@ - + diff --git a/app/alarm/logging-ui/.classpath b/app/alarm/logging-ui/.classpath index d2bd23f680..5e1ba79d4d 100644 --- a/app/alarm/logging-ui/.classpath +++ b/app/alarm/logging-ui/.classpath @@ -13,5 +13,6 @@ + diff --git a/app/alarm/model/.classpath b/app/alarm/model/.classpath index 68ad974070..304d6e9966 100644 --- a/app/alarm/model/.classpath +++ b/app/alarm/model/.classpath @@ -8,7 +8,7 @@ - + diff --git a/app/alarm/ui/.classpath b/app/alarm/ui/.classpath index 1cccf35543..8612764f09 100644 --- a/app/alarm/ui/.classpath +++ b/app/alarm/ui/.classpath @@ -10,7 +10,7 @@ - + diff --git a/app/display/convert-edm/.classpath b/app/display/convert-edm/.classpath index 686b611ff8..efe4c4718b 100644 --- a/app/display/convert-edm/.classpath +++ b/app/display/convert-edm/.classpath @@ -1,7 +1,7 @@ - + diff --git a/app/display/convert-medm/.classpath b/app/display/convert-medm/.classpath index 6ab03afca1..ac1d4cec3a 100644 --- a/app/display/convert-medm/.classpath +++ b/app/display/convert-medm/.classpath @@ -1,7 +1,7 @@ - + diff --git a/app/display/editor/.classpath b/app/display/editor/.classpath index 4e8bacbd3b..58a1b4c6ab 100644 --- a/app/display/editor/.classpath +++ b/app/display/editor/.classpath @@ -1,7 +1,7 @@ - + diff --git a/app/display/model/.classpath b/app/display/model/.classpath index 6b36eb4869..f1cf62ee2b 100644 --- a/app/display/model/.classpath +++ b/app/display/model/.classpath @@ -7,6 +7,6 @@ - + diff --git a/app/display/navigation/.classpath b/app/display/navigation/.classpath index 77ed499230..b324cd77ae 100644 --- a/app/display/navigation/.classpath +++ b/app/display/navigation/.classpath @@ -8,6 +8,6 @@ - + diff --git a/app/display/representation-javafx/.classpath b/app/display/representation-javafx/.classpath index 14c1757838..b4875b35dc 100644 --- a/app/display/representation-javafx/.classpath +++ b/app/display/representation-javafx/.classpath @@ -1,7 +1,7 @@ - + diff --git a/app/display/runtime/.classpath b/app/display/runtime/.classpath index 3968be5e64..482a5fed9e 100644 --- a/app/display/runtime/.classpath +++ b/app/display/runtime/.classpath @@ -5,7 +5,7 @@ - + diff --git a/app/display/thumbwheel/.classpath b/app/display/thumbwheel/.classpath index 793a5da5e6..5a0b26779b 100644 --- a/app/display/thumbwheel/.classpath +++ b/app/display/thumbwheel/.classpath @@ -1,7 +1,7 @@ - + diff --git a/app/email/ui/.classpath b/app/email/ui/.classpath index 6df0b5ff46..1468419582 100644 --- a/app/email/ui/.classpath +++ b/app/email/ui/.classpath @@ -7,6 +7,6 @@ - + diff --git a/app/errlog/.classpath b/app/errlog/.classpath index 0ca6fbe986..9e65c54382 100644 --- a/app/errlog/.classpath +++ b/app/errlog/.classpath @@ -7,6 +7,6 @@ - + diff --git a/app/rtplot/.classpath b/app/rtplot/.classpath index 69a191f71b..afa8b03c31 100644 --- a/app/rtplot/.classpath +++ b/app/rtplot/.classpath @@ -1,7 +1,7 @@ - + diff --git a/app/scan/client/.classpath b/app/scan/client/.classpath index 7bca49183b..02d4c0a63b 100644 --- a/app/scan/client/.classpath +++ b/app/scan/client/.classpath @@ -1,12 +1,12 @@ - - + + - + diff --git a/app/scan/model/.classpath b/app/scan/model/.classpath index 75b1bf4ce9..1414fdc49a 100644 --- a/app/scan/model/.classpath +++ b/app/scan/model/.classpath @@ -8,6 +8,7 @@ - + + diff --git a/app/scan/ui/.classpath b/app/scan/ui/.classpath index 98c7764e0d..29b2ced1b5 100644 --- a/app/scan/ui/.classpath +++ b/app/scan/ui/.classpath @@ -10,6 +10,6 @@ - + diff --git a/core/formula/.classpath b/core/formula/.classpath index 7150247533..608f02b509 100644 --- a/core/formula/.classpath +++ b/core/formula/.classpath @@ -4,7 +4,7 @@ - + diff --git a/core/ui/.classpath b/core/ui/.classpath index c036da79d1..5b665fbb54 100644 --- a/core/ui/.classpath +++ b/core/ui/.classpath @@ -1,7 +1,7 @@ - + diff --git a/dependencies/phoebus-target/.classpath b/dependencies/phoebus-target/.classpath index 5e9a04d34b..6f34d798eb 100644 --- a/dependencies/phoebus-target/.classpath +++ b/dependencies/phoebus-target/.classpath @@ -9,23 +9,8 @@ - - - - - - - - - - - - - - - - - + + @@ -42,8 +27,6 @@ - - @@ -131,10 +114,10 @@ - - + + - + @@ -159,14 +142,13 @@ - + - - + - + @@ -177,58 +159,57 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/services/alarm-server/.classpath b/services/alarm-server/.classpath index c6e58b6185..6dee175f7c 100644 --- a/services/alarm-server/.classpath +++ b/services/alarm-server/.classpath @@ -12,6 +12,6 @@ - + diff --git a/services/archive-engine/.classpath b/services/archive-engine/.classpath index 2c9d98829a..2225c2c8b6 100644 --- a/services/archive-engine/.classpath +++ b/services/archive-engine/.classpath @@ -9,6 +9,6 @@ - +