From 10d8f751410cb969a5690e5031f5b0a2935656be Mon Sep 17 00:00:00 2001 From: tobias <thinkdifferent055@gmail.com> Date: Fri, 30 Dec 2016 22:54:23 +0100 Subject: [PATCH] Add PlayPadNativeMac Module to IntelliJ --- .idea/modules.xml | 1 + .idea/workspace.xml | 122 +++++++++++------------- PlayWallNativeMac/PlayWallNativeMac.iml | 18 ++++ 3 files changed, 75 insertions(+), 66 deletions(-) create mode 100644 PlayWallNativeMac/PlayWallNativeMac.iml diff --git a/.idea/modules.xml b/.idea/modules.xml index 655b7b97..8cbebd01 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -4,6 +4,7 @@ <modules> <module fileurl="file://$PROJECT_DIR$/PlayWall/PlayWall.iml" filepath="$PROJECT_DIR$/PlayWall/PlayWall.iml" /> <module fileurl="file://$PROJECT_DIR$/PlayWallCore/PlayWallCore.iml" filepath="$PROJECT_DIR$/PlayWallCore/PlayWallCore.iml" /> + <module fileurl="file://$PROJECT_DIR$/PlayWallNativeMac/PlayWallNativeMac.iml" filepath="$PROJECT_DIR$/PlayWallNativeMac/PlayWallNativeMac.iml" /> </modules> </component> </project> \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 84369b2d..9cf18a44 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> + <component name="ArtifactsWorkspaceSettings"> + <artifacts-to-build> + <artifact name="PlayWall" /> + </artifacts-to-build> + </component> <component name="ChangeListManager"> - <list default="true" id="79f1c12d-cb47-4c05-a8f3-d2eb3588d81c" name="Default" comment="" /> + <list default="true" id="79f1c12d-cb47-4c05-a8f3-d2eb3588d81c" name="Default" comment=""> + <change type="DELETED" beforePath="$PROJECT_DIR$/PlayWall/src/de/tobias/playpad/view/PadView.java" afterPath="" /> + </list> <ignored path="$PROJECT_DIR$/PlayWall/bin/" /> <ignored path="$PROJECT_DIR$/PlayWallCore/bin/" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -59,69 +66,70 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="PackagesPane"> + <pane id="ProjectPane"> <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="PlayWall" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PlayWall" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + <option name="myItemId" value="PlayWallCore" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="PlayWall" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="PlayWall" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="de.tobias.playpad" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> </subPane> </pane> - <pane id="ProjectPane"> + <pane id="Scratches" /> + <pane id="Scope" /> + <pane id="PackagesPane"> <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="PlayWall" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PlayWallCore" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="PlayWall" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="PlayWall" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="PlayWall" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="de.tobias.playpad" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> </subPane> </pane> - <pane id="Scope" /> - <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> <property name="settings.editor.selected.configurable" value="preferences.fileTypes" /> - <property name="project.structure.last.edited" value="Global Libraries" /> + <property name="project.structure.last.edited" value="Artifacts" /> <property name="project.structure.proportion" value="0.15" /> <property name="project.structure.side.proportion" value="0.2" /> <property name="SearchEverywhereHistoryKey" value="giti	FILE	file:///Users/tobias/Documents/Programmieren/Java/git/PlayWall/PlayWall/src/de/tobias/playpad/.gitignore IPadViewCon	PSI	JAVA://de.tobias.playpad.pad.viewcontroller.IPadViewController" /> <property name="last_directory_selection" value="$PROJECT_DIR$/PlayWall/src/de/tobias/playpad" /> + <property name="last_opened_file_path" value="$PROJECT_DIR$" /> </component> <component name="RunManager" selected="Application.PlayPadMain"> <configuration default="false" name="PlayPadMain" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> @@ -332,25 +340,25 @@ <frame x="-1920" y="-257" width="1920" height="1057" extended-state="6" /> <editor active="false" /> <layout> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> - <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" /> + <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16535018" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Palette	" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24960506" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32953367" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> </layout> </component> <component name="VcsContentAnnotationSettings"> @@ -365,7 +373,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -373,7 +380,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -381,7 +387,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="30"> <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -389,15 +394,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="165"> <caret line="15" column="17" lean-forward="false" selection-start-line="15" selection-start-column="17" selection-end-line="15" selection-end-column="17" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/PlayWall/src/de/tobias/playpad/view/PadView.java"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="240"> - <caret line="16" column="27" lean-forward="true" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="27" /> - <folding /> </state> </provider> </entry> @@ -405,7 +401,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="150"> <caret line="43" column="44" lean-forward="false" selection-start-line="43" selection-start-column="44" selection-end-line="43" selection-end-column="44" /> - <folding /> </state> </provider> </entry> @@ -413,23 +408,14 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="3288"> <caret line="553" column="16" lean-forward="true" selection-start-line="553" selection-start-column="16" selection-end-line="553" selection-end-column="16" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/PlayWall/src/de/tobias/playpad/ScalaTest.scala"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="120"> - <caret line="8" column="28" lean-forward="false" selection-start-line="8" selection-start-column="28" selection-end-line="8" selection-end-column="28" /> - <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/PlayWall/src/de/tobias/playpad/ScalaTest.scala" /> <entry file="file://$PROJECT_DIR$/PlayWall/src/de/tobias/playpad/.gitignore"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="30"> <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -437,7 +423,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -445,7 +430,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -454,12 +438,12 @@ <state relative-caret-position="435"> <caret line="85" column="0" lean-forward="false" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" /> <folding> - <marker date="1483133721000" expanded="false" signature="6719:6724" ph=" { " /> - <marker date="1483133721000" expanded="false" signature="6764:6767" ph=" }" /> - <marker date="1483133721000" expanded="false" signature="6806:6811" ph=" { " /> - <marker date="1483133721000" expanded="false" signature="6838:6841" ph=" }" /> - <marker date="1483133721000" expanded="false" signature="7012:7017" ph=" { " /> - <marker date="1483133721000" expanded="false" signature="7029:7032" ph=" }" /> + <marker date="1483134334000" expanded="false" signature="6719:6724" ph=" { " /> + <marker date="1483134334000" expanded="false" signature="6764:6767" ph=" }" /> + <marker date="1483134334000" expanded="false" signature="6806:6811" ph=" { " /> + <marker date="1483134334000" expanded="false" signature="6838:6841" ph=" }" /> + <marker date="1483134334000" expanded="false" signature="7012:7017" ph=" { " /> + <marker date="1483134334000" expanded="false" signature="7029:7032" ph=" }" /> </folding> </state> </provider> @@ -468,7 +452,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="15"> <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="10" /> - <folding /> </state> </provider> </entry> @@ -476,7 +459,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -484,7 +466,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="45"> <caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" /> - <folding /> </state> </provider> </entry> @@ -492,7 +473,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="206"> <caret line="32" column="11" lean-forward="false" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="11" /> - <folding /> </state> </provider> </entry> @@ -508,6 +488,13 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="-30"> <caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/PlayWall/src/de/tobias/playpad/view/PadView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="120"> + <caret line="8" column="33" lean-forward="false" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" /> <folding /> </state> </provider> @@ -518,10 +505,12 @@ <state key="ArtifactsStructureConfigurable.UI"> <settings> <artifact-editor /> + <last-edited>PlayWall</last-edited> <splitter-proportions> <option name="proportions"> <list> <option value="0.2" /> + <option value="0.5" /> </list> </option> </splitter-proportions> @@ -558,6 +547,7 @@ <option name="proportions"> <list> <option value="0.2" /> + <option value="0.6" /> </list> </option> </splitter-proportions> diff --git a/PlayWallNativeMac/PlayWallNativeMac.iml b/PlayWallNativeMac/PlayWallNativeMac.iml new file mode 100644 index 00000000..5cfcac1b --- /dev/null +++ b/PlayWallNativeMac/PlayWallNativeMac.iml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> + <output url="file://$MODULE_DIR$/bin" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="false" /> + </content> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="module" module-name="PlayWallCore" /> + <orderEntry type="library" name="YML" level="application" /> + <orderEntry type="library" name="Plugins" level="application" /> + <orderEntry type="library" name="Updater" level="application" /> + <orderEntry type="library" name="libUtils" level="application" /> + </component> +</module> \ No newline at end of file -- GitLab