Skip to content

GitLab

Commit 9cf6def2 authored by Adam Blank's avatar Adam Blank
Browse files

Updates workspace

parent b0654260
master
No related merge requests found
Pipeline #4736 canceled with stage
Show whitespace changes
Inline Side-by-side
Showing
with 41 additions and 141 deletions
+41 -141
.DS_Store
View file @ 9cf6def2
No preview for this file type
.idea/misc.xml
View file @ 9cf6def2
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<component name="PreferredVcsStorage"> <component name="PreferredVcsStorage">
<preferredVcsName>ApexVCS</preferredVcsName> <preferredVcsName>ApexVCS</preferredVcsName>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11.0.1" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>
\ No newline at end of file
.idea/workspace.xml
View file @ 9cf6def2
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="35fce098-9be2-4747-bc65-5a45ced07bad" name="Default Changelist" comment="fixed naming on file to transposed"> <list default="true" id="35fce098-9be2-4747-bc65-5a45ced07bad" name="Default Changelist" comment="fixed naming on file to transposed">
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/ImageManipulatorTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/ImageManipulatorTests.java" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/out/" /> <ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -21,23 +21,11 @@ ...@@ -21,23 +21,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="600"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="600">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab03/ImageManipulator.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab03/Image.java"> <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab03/Image.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="326">
<caret line="12" column="37" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="37" /> <caret line="41" column="37" selection-start-line="41" selection-start-column="37" selection-end-line="41" selection-end-column="37" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -45,11 +33,11 @@ ...@@ -45,11 +33,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/ImageManipulatorTests.java"> <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab03/ImageManipulator.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480"> <state relative-caret-position="195">
<caret line="68" column="14" selection-start-line="68" selection-start-column="14" selection-end-line="68" selection-end-column="14" /> <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
...@@ -57,21 +45,6 @@ ...@@ -57,21 +45,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/data/SpaceElephants.hidden.png">
<provider selected="true" editor-type-id="images" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/data/mario.transposed.png">
<provider selected="true" editor-type-id="images" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/tests/data/guernica.transposed.png">
<provider selected="true" editor-type-id="images" />
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
...@@ -115,11 +88,10 @@ ...@@ -115,11 +88,10 @@
<detection-done>true</detection-done> <detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting> <sorting>DEFINITION_ORDER</sorting>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds">
<option name="x" value="134" /> <option name="y" value="23" />
<option name="y" value="35" /> <option name="width" value="1440" />
<option name="width" value="1213" /> <option name="height" value="877" />
<option name="height" value="1405" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView"> <component name="ProjectView">
...@@ -127,72 +99,19 @@ ...@@ -127,72 +99,19 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
<path> <path>
<item name="lab03-alpha" type="b2602c69:ProjectViewProjectNode" /> <item name="lab03" type="b2602c69:ProjectViewProjectNode" />
<item name="lab03-alpha" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="lab03-alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="lab03-alpha" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="lab03-alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="lab03-alpha" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="cs2" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="lab03-alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="lab03-alpha" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="cs2" type="462c0819:PsiDirectoryNode" />
<item name="lab03" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="lab03-alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="lab03-alpha" type="462c0819:PsiDirectoryNode" />
<item name="tests" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="lab03-alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="lab03-alpha" type="462c0819:PsiDirectoryNode" />
<item name="tests" type="462c0819:PsiDirectoryNode" />
<item name="data" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="lab03-alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="lab03-alpha" type="462c0819:PsiDirectoryNode" />
<item name="tests" type="462c0819:PsiDirectoryNode" />
<item name="cs2" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="lab03-alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="lab03-alpha" type="462c0819:PsiDirectoryNode" />
<item name="tests" type="462c0819:PsiDirectoryNode" />
<item name="cs2" type="462c0819:PsiDirectoryNode" />
<item name="helpers" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="lab03-alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="lab03-alpha" type="462c0819:PsiDirectoryNode" />
<item name="tests" type="462c0819:PsiDirectoryNode" />
<item name="cs2" type="462c0819:PsiDirectoryNode" />
<item name="lab03" type="462c0819:PsiDirectoryNode" /> <item name="lab03" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="lab03-alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" /> <pane id="PackagesPane" />
<pane id="Scope" />
<pane id="Course" /> <pane id="Course" />
</panes> </panes>
</component> </component>
...@@ -204,7 +123,7 @@ ...@@ -204,7 +123,7 @@
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1545942890684" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1545942890684" />
<property name="last_directory_selection" value="$PROJECT_DIR$/tests/edu/caltech/cs2" /> <property name="last_directory_selection" value="$PROJECT_DIR$/tests/edu/caltech/cs2" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../lab03" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="project.structure.last.edited" value="Libraries" /> <property name="project.structure.last.edited" value="Libraries" />
...@@ -238,7 +157,7 @@ ...@@ -238,7 +157,7 @@
</list> </list>
</option> </option>
</component> </component>
<component name="RunManager" selected="JUnit.ImageManipulatorTests"> <component name="RunManager" selected="JUnit.C">
<configuration name="ImageManipulator" type="Application" factoryName="Application"> <configuration name="ImageManipulator" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="edu.caltech.cs2.lab03.ImageManipulator" /> <option name="MAIN_CLASS_NAME" value="edu.caltech.cs2.lab03.ImageManipulator" />
<module name="lab03-steganography" /> <module name="lab03-steganography" />
...@@ -279,32 +198,12 @@ ...@@ -279,32 +198,12 @@
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
</method> </method>
</configuration> </configuration>
<configuration name="ImageManipulatorTests" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<module name="lab03-steganography" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="edu.caltech.cs2.lab03.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<option name="PACKAGE_NAME" value="edu.caltech.cs2.lab03" />
<option name="MAIN_CLASS_NAME" value="edu.caltech.cs2.lab03.ImageManipulatorTests" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<list> <list>
<item itemvalue="Application.ImageManipulator" /> <item itemvalue="Application.ImageManipulator" />
<item itemvalue="JUnit.A" /> <item itemvalue="JUnit.A" />
<item itemvalue="JUnit.B" /> <item itemvalue="JUnit.B" />
<item itemvalue="JUnit.C" /> <item itemvalue="JUnit.C" />
<item itemvalue="JUnit.ImageManipulatorTests" />
</list> </list>
<recent_temporary>
<list>
<item itemvalue="JUnit.ImageManipulatorTests" />
</list>
</recent_temporary>
</component> </component>
<component name="SvnConfiguration"> <component name="SvnConfiguration">
<configuration /> <configuration />
...@@ -401,16 +300,17 @@ ...@@ -401,16 +300,17 @@
<option name="totallyTimeSpent" value="15889000" /> <option name="totallyTimeSpent" value="15889000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="67" y="25" width="2493" height="1415" extended-state="6" /> <frame x="0" y="23" width="1440" height="877" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3069064" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3111588" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Designer" order="2" /> <window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" /> <window_info id="Image Layers" order="3" />
<window_info id="UI Designer" order="4" /> <window_info id="UI Designer" order="4" />
<window_info id="Favorites" order="5" side_tool="true" /> <window_info id="Favorites" order="5" side_tool="true" />
<window_info id="Capture Tool" order="6" /> <window_info id="Capture Tool" order="6" />
<window_info anchor="bottom" id="Floobits" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32884097" /> <window_info anchor="bottom" id="Find" order="1" weight="0.32884097" />
<window_info anchor="bottom" id="Run" order="2" sideWeight="0.49957228" weight="0.24231783" /> <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49957228" weight="0.24231783" />
...@@ -421,7 +321,7 @@ ...@@ -421,7 +321,7 @@
<window_info anchor="bottom" id="Log Viewer" order="7" /> <window_info anchor="bottom" id="Log Viewer" order="7" />
<window_info anchor="bottom" id="Terminal" order="8" /> <window_info anchor="bottom" id="Terminal" order="8" />
<window_info anchor="bottom" id="CheckStyle" order="9" /> <window_info anchor="bottom" id="CheckStyle" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5004277" side_tool="true" visible="true" weight="0.23094867" /> <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5004277" side_tool="true" weight="0.23057325" />
<window_info anchor="bottom" id="Anonymous Apex" order="11" /> <window_info anchor="bottom" id="Anonymous Apex" order="11" />
<window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" order="12" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.49957228" weight="0.32923618" /> <window_info anchor="bottom" id="Version Control" order="13" sideWeight="0.49957228" weight="0.32923618" />
...@@ -469,13 +369,10 @@ ...@@ -469,13 +369,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$USER_HOME$/Downloads/StegoTests.java" /> <entry file="file://$PROJECT_DIR$/../Downloads/StegoTests.java" />
<entry file="file://$PROJECT_DIR$/tests/data/puppy.png"> <entry file="file://$PROJECT_DIR$/tests/data/puppy.png">
<provider selected="true" editor-type-id="images" /> <provider selected="true" editor-type-id="images" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lab03-steganography.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/helpers/ImageFileSource.java"> <entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/helpers/ImageFileSource.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105"> <state relative-caret-position="105">
...@@ -528,12 +425,28 @@ ...@@ -528,12 +425,28 @@
<entry file="file://$PROJECT_DIR$/tests/data/allWhite.transposed.png"> <entry file="file://$PROJECT_DIR$/tests/data/allWhite.transposed.png">
<provider selected="true" editor-type-id="images" /> <provider selected="true" editor-type-id="images" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/tests/data/SpaceElephants.hidden.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/ImageManipulatorTests.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="479">
<caret line="68" column="14" selection-start-line="68" selection-start-column="14" selection-end-line="68" selection-end-column="14" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/data/mario.transposed.png"> <entry file="file://$PROJECT_DIR$/tests/data/mario.transposed.png">
<provider selected="true" editor-type-id="images" /> <provider selected="true" editor-type-id="images" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/tests/data/guernica.transposed.png"> <entry file="file://$PROJECT_DIR$/tests/data/guernica.transposed.png">
<provider selected="true" editor-type-id="images" /> <provider selected="true" editor-type-id="images" />
</entry> </entry>
<entry file="file://$PROJECT_DIR$/lab03-steganography.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab03/ImageManipulator.java"> <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab03/ImageManipulator.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="195">
...@@ -546,21 +459,8 @@ ...@@ -546,21 +459,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab03/Image.java"> <entry file="file://$PROJECT_DIR$/src/edu/caltech/cs2/lab03/Image.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="326">
<caret line="12" column="37" selection-start-line="12" selection-start-column="37" selection-end-line="12" selection-end-column="37" /> <caret line="41" column="37" selection-start-line="41" selection-start-column="37" selection-end-line="41" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/tests/data/SpaceElephants.hidden.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/tests/edu/caltech/cs2/lab03/ImageManipulatorTests.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480">
<caret line="68" column="14" selection-start-line="68" selection-start-column="14" selection-end-line="68" selection-end-column="14" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment