From 0873b313aa4d75d793a9204d6d28cf26f9f2549d Mon Sep 17 00:00:00 2001 From: Richard Bair Date: Tue, 9 Jul 2013 11:31:53 -0700 Subject: [PATCH] RT-31518: IDEA project files should be moved from idea into .idea --- .hgignore | 6 +- .idea/.name | 2 +- .idea/3DViewer.iml | 35 ++++++ .idea/Ensemble8.iml | 51 +++++++++ .idea/Modena.iml | 15 +++ .idea/ant.xml | 7 -- .idea/atlassian-ide-plugin.xml | 7 ++ .idea/base.iml | 21 ++++ .idea/buildSrc.iml | 88 +++++++++++++++ {idea => .idea}/builders.iml | 12 +- .idea/codeStyleSettings.xml | 28 ----- .idea/compiler.xml | 28 +++-- .idea/controls.iml | 19 ++++ .idea/copyright/OpenJFX_GPL.xml | 9 -- .idea/copyright/profiles_settings.xml | 2 +- .idea/deploy.iml | 35 ++++++ {idea => .idea}/designTime.iml | 6 +- {idea => .idea}/fxml.iml | 12 +- {idea => .idea}/fxpackager.iml | 8 +- {idea/.idea => .idea}/gradle.xml | 0 .idea/graphics.iml | 28 +++++ .idea/libraries/jfxrt_binary_stub.xml | 10 -- .idea/libraries/junit_4_8_2.xml | 9 -- {idea => .idea}/media.iml | 2 +- .idea/misc.xml | 10 +- .idea/modules.xml | 28 +++-- .idea/rt-closed.iml | 119 ++++++++++++++++++++ {idea => .idea}/rt.iml | 7 +- {idea => .idea}/swing.iml | 6 +- {idea => .idea}/swt.iml | 6 +- .idea/vcs.xml | 2 + {idea => .idea}/web.iml | 12 +- idea/.idea/.name | 1 - idea/.idea/compiler.xml | 27 ----- idea/.idea/copyright/profiles_settings.xml | 5 - idea/.idea/encodings.xml | 5 - idea/.idea/misc.xml | 11 -- idea/.idea/modules.xml | 26 ----- idea/.idea/scopes/scope_settings.xml | 5 - idea/.idea/uiDesigner.xml | 125 --------------------- idea/.idea/vcs.xml | 9 -- idea/3DViewer.iml | 35 ------ idea/Ensemble8.iml | 51 --------- idea/Modena.iml | 15 --- idea/base.iml | 21 ---- idea/buildSrc.iml | 88 --------------- idea/controls.iml | 19 ---- idea/deploy.iml | 35 ------ idea/graphics.iml | 28 ----- idea/rt-closed.iml | 119 -------------------- 50 files changed, 499 insertions(+), 756 deletions(-) create mode 100644 .idea/3DViewer.iml create mode 100644 .idea/Ensemble8.iml create mode 100644 .idea/Modena.iml delete mode 100644 .idea/ant.xml create mode 100644 .idea/atlassian-ide-plugin.xml create mode 100644 .idea/base.iml create mode 100644 .idea/buildSrc.iml rename {idea => .idea}/builders.iml (56%) delete mode 100644 .idea/codeStyleSettings.xml create mode 100644 .idea/controls.iml delete mode 100644 .idea/copyright/OpenJFX_GPL.xml create mode 100644 .idea/deploy.iml rename {idea => .idea}/designTime.iml (60%) rename {idea => .idea}/fxml.iml (54%) rename {idea => .idea}/fxpackager.iml (51%) rename {idea/.idea => .idea}/gradle.xml (100%) create mode 100644 .idea/graphics.iml delete mode 100644 .idea/libraries/jfxrt_binary_stub.xml delete mode 100644 .idea/libraries/junit_4_8_2.xml rename {idea => .idea}/media.iml (83%) create mode 100644 .idea/rt-closed.iml rename {idea => .idea}/rt.iml (75%) rename {idea => .idea}/swing.iml (65%) rename {idea => .idea}/swt.iml (66%) rename {idea => .idea}/web.iml (55%) delete mode 100644 idea/.idea/.name delete mode 100644 idea/.idea/compiler.xml delete mode 100644 idea/.idea/copyright/profiles_settings.xml delete mode 100644 idea/.idea/encodings.xml delete mode 100644 idea/.idea/misc.xml delete mode 100644 idea/.idea/modules.xml delete mode 100644 idea/.idea/scopes/scope_settings.xml delete mode 100644 idea/.idea/uiDesigner.xml delete mode 100644 idea/.idea/vcs.xml delete mode 100644 idea/3DViewer.iml delete mode 100644 idea/Ensemble8.iml delete mode 100644 idea/Modena.iml delete mode 100644 idea/base.iml delete mode 100644 idea/buildSrc.iml delete mode 100644 idea/controls.iml delete mode 100644 idea/deploy.iml delete mode 100644 idea/graphics.iml delete mode 100644 idea/rt-closed.iml diff --git a/.hgignore b/.hgignore index 106b62f442..d990f45b68 100644 --- a/.hgignore +++ b/.hgignore @@ -6,11 +6,11 @@ \.rej$ \.conflict\~$ ^\.ant-targets.*$ -\.idea/tasks.xml$ -\.idea/workspace.xml$ +^.idea/tasks.xml$ +^.idea/workspace.xml$ ^\.gradle/ ^buildSrc/\.gradle/ -^idea/out/ +^.idea/out/ build/ bin/ dist/ diff --git a/.idea/.name b/.idea/.name index a71b3c3832..6ec52fa16e 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -OpenJFX \ No newline at end of file +rt \ No newline at end of file diff --git a/.idea/3DViewer.iml b/.idea/3DViewer.iml new file mode 100644 index 0000000000..55abc6e244 --- /dev/null +++ b/.idea/3DViewer.iml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/Ensemble8.iml b/.idea/Ensemble8.iml new file mode 100644 index 0000000000..48ed8d6b80 --- /dev/null +++ b/.idea/Ensemble8.iml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/Modena.iml b/.idea/Modena.iml new file mode 100644 index 0000000000..a07f8f2204 --- /dev/null +++ b/.idea/Modena.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/.idea/ant.xml b/.idea/ant.xml deleted file mode 100644 index 2581ca3fe8..0000000000 --- a/.idea/ant.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.idea/atlassian-ide-plugin.xml b/.idea/atlassian-ide-plugin.xml new file mode 100644 index 0000000000..433ebda9da --- /dev/null +++ b/.idea/atlassian-ide-plugin.xml @@ -0,0 +1,7 @@ + + + + 939232b1-9eb9-4c88-a44d-3abafd865a34 + d42c85b0-998b-4a94-ad2b-02b0c042c35e + + \ No newline at end of file diff --git a/.idea/base.iml b/.idea/base.iml new file mode 100644 index 0000000000..66622a5948 --- /dev/null +++ b/.idea/base.iml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/buildSrc.iml b/.idea/buildSrc.iml new file mode 100644 index 0000000000..7127b2c06a --- /dev/null +++ b/.idea/buildSrc.iml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/idea/builders.iml b/.idea/builders.iml similarity index 56% rename from idea/builders.iml rename to .idea/builders.iml index 6b8fd81df3..3781c2dcf4 100644 --- a/idea/builders.iml +++ b/.idea/builders.iml @@ -1,25 +1,25 @@ - + - + - - + + - + - + diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index ea74301e83..0000000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - diff --git a/.idea/compiler.xml b/.idea/compiler.xml index a1b41c52c7..177d08a459 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,20 +2,26 @@ diff --git a/.idea/controls.iml b/.idea/controls.iml new file mode 100644 index 0000000000..60a83f3b3a --- /dev/null +++ b/.idea/controls.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/.idea/copyright/OpenJFX_GPL.xml b/.idea/copyright/OpenJFX_GPL.xml deleted file mode 100644 index 2fc7447ee8..0000000000 --- a/.idea/copyright/OpenJFX_GPL.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml index 80dd30eefe..3572571ad8 100644 --- a/.idea/copyright/profiles_settings.xml +++ b/.idea/copyright/profiles_settings.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/.idea/deploy.iml b/.idea/deploy.iml new file mode 100644 index 0000000000..5560d0501d --- /dev/null +++ b/.idea/deploy.iml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/idea/designTime.iml b/.idea/designTime.iml similarity index 60% rename from idea/designTime.iml rename to .idea/designTime.iml index 54e395f745..84542b4813 100644 --- a/idea/designTime.iml +++ b/.idea/designTime.iml @@ -2,9 +2,9 @@ - - - + + + diff --git a/idea/fxml.iml b/.idea/fxml.iml similarity index 54% rename from idea/fxml.iml rename to .idea/fxml.iml index 7e0d8fff77..d45343d5ee 100644 --- a/idea/fxml.iml +++ b/.idea/fxml.iml @@ -2,12 +2,12 @@ - - - - - - + + + + + + diff --git a/idea/fxpackager.iml b/.idea/fxpackager.iml similarity index 51% rename from idea/fxpackager.iml rename to .idea/fxpackager.iml index 2887834594..b711336da0 100644 --- a/idea/fxpackager.iml +++ b/.idea/fxpackager.iml @@ -2,10 +2,10 @@ - - - - + + + + diff --git a/idea/.idea/gradle.xml b/.idea/gradle.xml similarity index 100% rename from idea/.idea/gradle.xml rename to .idea/gradle.xml diff --git a/.idea/graphics.iml b/.idea/graphics.iml new file mode 100644 index 0000000000..3b827e05dd --- /dev/null +++ b/.idea/graphics.iml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/libraries/jfxrt_binary_stub.xml b/.idea/libraries/jfxrt_binary_stub.xml deleted file mode 100644 index a4d4dfe58e..0000000000 --- a/.idea/libraries/jfxrt_binary_stub.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/.idea/libraries/junit_4_8_2.xml b/.idea/libraries/junit_4_8_2.xml deleted file mode 100644 index afc0a68f1d..0000000000 --- a/.idea/libraries/junit_4_8_2.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/idea/media.iml b/.idea/media.iml similarity index 83% rename from idea/media.iml rename to .idea/media.iml index 9efa6a4247..7345a36028 100644 --- a/idea/media.iml +++ b/.idea/media.iml @@ -2,7 +2,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index c8c78364f2..ac8fa666b5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,13 +3,9 @@ - - - http://www.w3.org/1999/xhtml + + + - - - - diff --git a/.idea/modules.xml b/.idea/modules.xml index 9a20a9b192..1775b72595 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,16 +2,24 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/.idea/rt-closed.iml b/.idea/rt-closed.iml new file mode 100644 index 0000000000..2aa8528b61 --- /dev/null +++ b/.idea/rt-closed.iml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/idea/rt.iml b/.idea/rt.iml similarity index 75% rename from idea/rt.iml rename to .idea/rt.iml index b1bbf577f8..3c01f5a8be 100644 --- a/idea/rt.iml +++ b/.idea/rt.iml @@ -2,9 +2,9 @@ - - - + + + @@ -14,6 +14,7 @@ + diff --git a/idea/swing.iml b/.idea/swing.iml similarity index 65% rename from idea/swing.iml rename to .idea/swing.iml index e19340fee5..0b9732e3d4 100644 --- a/idea/swing.iml +++ b/.idea/swing.iml @@ -2,9 +2,9 @@ - - - + + + diff --git a/idea/swt.iml b/.idea/swt.iml similarity index 66% rename from idea/swt.iml rename to .idea/swt.iml index 4e4fad8509..73c2d7868e 100644 --- a/idea/swt.iml +++ b/.idea/swt.iml @@ -2,9 +2,9 @@ - - - + + + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index def6a6a184..4a25f17e8f 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,8 @@ + + diff --git a/idea/web.iml b/.idea/web.iml similarity index 55% rename from idea/web.iml rename to .idea/web.iml index 61f7da6b83..f3f65277d2 100644 --- a/idea/web.iml +++ b/.idea/web.iml @@ -2,11 +2,11 @@ - - - - - + + + + + @@ -15,7 +15,7 @@ - + diff --git a/idea/.idea/.name b/idea/.idea/.name deleted file mode 100644 index 6ec52fa16e..0000000000 --- a/idea/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -rt \ No newline at end of file diff --git a/idea/.idea/compiler.xml b/idea/.idea/compiler.xml deleted file mode 100644 index 7be400ed8f..0000000000 --- a/idea/.idea/compiler.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - diff --git a/idea/.idea/copyright/profiles_settings.xml b/idea/.idea/copyright/profiles_settings.xml deleted file mode 100644 index 3572571ad8..0000000000 --- a/idea/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/idea/.idea/encodings.xml b/idea/.idea/encodings.xml deleted file mode 100644 index e206d70d85..0000000000 --- a/idea/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/idea/.idea/misc.xml b/idea/.idea/misc.xml deleted file mode 100644 index 0c7658e230..0000000000 --- a/idea/.idea/misc.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/idea/.idea/modules.xml b/idea/.idea/modules.xml deleted file mode 100644 index 57c7ec2af8..0000000000 --- a/idea/.idea/modules.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/idea/.idea/scopes/scope_settings.xml b/idea/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b843..0000000000 --- a/idea/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/idea/.idea/uiDesigner.xml b/idea/.idea/uiDesigner.xml deleted file mode 100644 index 3b00020308..0000000000 --- a/idea/.idea/uiDesigner.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/idea/.idea/vcs.xml b/idea/.idea/vcs.xml deleted file mode 100644 index 6d27f9343f..0000000000 --- a/idea/.idea/vcs.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/idea/3DViewer.iml b/idea/3DViewer.iml deleted file mode 100644 index 2e192a3fd3..0000000000 --- a/idea/3DViewer.iml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/idea/Ensemble8.iml b/idea/Ensemble8.iml deleted file mode 100644 index d9d88453b7..0000000000 --- a/idea/Ensemble8.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/idea/Modena.iml b/idea/Modena.iml deleted file mode 100644 index 00bc4c8881..0000000000 --- a/idea/Modena.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/idea/base.iml b/idea/base.iml deleted file mode 100644 index 68bd7a453e..0000000000 --- a/idea/base.iml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/idea/buildSrc.iml b/idea/buildSrc.iml deleted file mode 100644 index b7fa20b354..0000000000 --- a/idea/buildSrc.iml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/idea/controls.iml b/idea/controls.iml deleted file mode 100644 index 363ca63dea..0000000000 --- a/idea/controls.iml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/idea/deploy.iml b/idea/deploy.iml deleted file mode 100644 index 5546541b68..0000000000 --- a/idea/deploy.iml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/idea/graphics.iml b/idea/graphics.iml deleted file mode 100644 index 568de1770b..0000000000 --- a/idea/graphics.iml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/idea/rt-closed.iml b/idea/rt-closed.iml deleted file mode 100644 index bfdf01d54b..0000000000 --- a/idea/rt-closed.iml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -