From 4da997d9a7cae952916528290ab5e48919708932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Andr=C3=A9=20Gaustad?= <henriaga@stud.ntnu.no>
Date: Wed, 1 Mar 2023 13:56:38 +0100
Subject: [PATCH] Revert "Merge branch 'room-implementation' into 'main'"
This reverts merge request !4
---
.idea/checkstyleidea-libs/readme.txt | 6 -
.idea/uiDesigner.xml | 124 ------------------
.idea/workspace.xml | 73 +----------
src/main/java/edu/ntnu/idatt2001/Link.java | 99 --------------
src/main/java/edu/ntnu/idatt2001/Passage.java | 55 --------
5 files changed, 7 insertions(+), 350 deletions(-)
delete mode 100644 .idea/checkstyleidea-libs/readme.txt
delete mode 100644 .idea/uiDesigner.xml
delete mode 100644 src/main/java/edu/ntnu/idatt2001/Link.java
delete mode 100644 src/main/java/edu/ntnu/idatt2001/Passage.java
diff --git a/.idea/checkstyleidea-libs/readme.txt b/.idea/checkstyleidea-libs/readme.txt
deleted file mode 100644
index 193996d..0000000
--- a/.idea/checkstyleidea-libs/readme.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-This folder contains libraries copied from the "mappeoppgave" project.
-It is managed by the CheckStyle-IDEA IDE plugin.
-Do not modify this folder while the IDE is running.
-When the IDE is stopped, you may delete this folder at any time. It will be recreated as needed.
-In order to prevent the CheckStyle-IDEA IDE plugin from creating this folder,
-uncheck the "Copy libraries from project directory" option in the CheckStyle-IDEA settings dialog.
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index 2b63946..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Palette2">
- <group name="Swing">
- <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
- </item>
- <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
- <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
- <initial-values>
- <property name="text" value="Button" />
- </initial-values>
- </item>
- <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="RadioButton" />
- </initial-values>
- </item>
- <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="CheckBox" />
- </initial-values>
- </item>
- <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="Label" />
- </initial-values>
- </item>
- <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
- <preferred-size width="-1" height="20" />
- </default-constraints>
- </item>
- <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
- </item>
- <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
- </item>
- </group>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3cabc71..500316f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,65 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="AutoImportSettings">
- <option name="autoReloadType" value="SELECTIVE" />
- </component>
<component name="ChangeListManager">
- <list default="true" id="9177539b-b1ac-4384-89fc-877044b29755" name="Changes" comment="">
- <change beforePath="$PROJECT_DIR$/src/main/java/Link.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/ntnu/idatt2001/Link.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/java/Passage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/edu/ntnu/idatt2001/Passage.java" afterDir="false" />
- </list>
+ <list default="true" id="9177539b-b1ac-4384-89fc-877044b29755" name="Changes" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
- <component name="Git.Settings">
- <option name="RECENT_BRANCH_BY_REPOSITORY">
- <map>
- <entry key="$PROJECT_DIR$" value="main" />
- </map>
- </option>
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
- </component>
- <component name="MarkdownSettingsMigration">
- <option name="stateVersion" value="1" />
- </component>
<component name="ProjectId" id="2M0VwdPKAtNpkRhy59uJPzvfJDF" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent">{
- "keyToString": {
- "RunOnceActivity.OpenProjectViewOnStart": "true",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "WebServerToolWindowFactoryState": "false",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "vue.rearranger.settings.migration": "true"
+ <component name="PropertiesComponent"><![CDATA[{
+ "keyToString": {
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "WebServerToolWindowFactoryState": "false"
}
-}</component>
- <component name="RecentsManager">
- <key name="MoveFile.RECENT_KEYS">
- <recent name="C:\programmering\mappeprosjekt\src\main\java" />
- </key>
- </component>
- <component name="RunManager">
- <configuration default="true" type="JetRunConfigurationType">
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
- <option name="filePath" />
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
- </component>
+}]]></component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
@@ -68,26 +28,7 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1676904737300</updated>
- <workItem from="1677108880650" duration="1437000" />
- <workItem from="1677118096891" duration="6012000" />
</task>
<servers />
</component>
- <component name="TypeScriptGeneratedFilesManager">
- <option name="version" value="3" />
- </component>
- <component name="Vcs.Log.Tabs.Properties">
- <option name="TAB_STATES">
- <map>
- <entry key="MAIN">
- <value>
- <State />
- </value>
- </entry>
- </map>
- </option>
- </component>
- <component name="VcsManagerConfiguration">
- <option name="LAST_COMMIT_MESSAGE" value="" />
- </component>
</project>
\ No newline at end of file
diff --git a/src/main/java/edu/ntnu/idatt2001/Link.java b/src/main/java/edu/ntnu/idatt2001/Link.java
deleted file mode 100644
index 3de5451..0000000
--- a/src/main/java/edu/ntnu/idatt2001/Link.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package edu.ntnu.idatt2001;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * Class representing a link between different parts of the story.
- */
-public class Link {
- private String text;
- private String refrence;
- private List<Action> actions;
-
- /**
- * Creates a link with the specified parameters.
- *
- * @param text Text describing an event or choice in the story.
- * @param refrence Unique reference to a passage.
- */
- public Link(String text, String refrence) {
- this.text = text;
- this.refrence = refrence;
- this.actions = new ArrayList<Action>();
- }
-
- /**
- * Gets the links text.
- *
- * @return The links text.
- */
- public String getText() {
- return text;
- }
-
- /**
- * Gets the links reference.
- *
- * @return The links reference.
- */
- public String getRefrence() {
- return refrence;
- }
-
- /**
- * Adds an action to the link.
- *
- * @param action The action added to the link.
- */
- public void addAction(Action action) {
- actions.add(action);
- }
-
- /**
- * Gets the links actions.
- *
- * @return List containing the links actions.
- */
- public List<Action> getActions() {
- return actions;
- }
-
- /**
- * Returns a string representing the link.
- *
- * @return A string representing the link.
- */
- @Override
- public String toString() {
- return "Link toString" + ": " +
- getRefrence() + ", " +
- getText() + ", " +
- getRefrence();
- }
-
- /**
- * Checks if the link is equal to another object.
- *
- * @param o The other object being compared.
- * @return True if the objects are equal, or False if not.
- */
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- Link link = (Link) o;
- return text.equals(link.text) && refrence.equals(link.refrence) && Objects.equals(actions, link.actions);
- }
-
- /**
- * Generates a hash value representing the object.
- *
- * @return hash value
- */
- @Override
- public int hashCode() {
- return Objects.hash(text, refrence, actions);
- }
-}
\ No newline at end of file
diff --git a/src/main/java/edu/ntnu/idatt2001/Passage.java b/src/main/java/edu/ntnu/idatt2001/Passage.java
deleted file mode 100644
index 4a1995a..0000000
--- a/src/main/java/edu/ntnu/idatt2001/Passage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package edu.ntnu.idatt2001;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
-public class Passage {
- private String title;
- private String content;
- private List<Link> links;
-
- public Passage (String title, String content) {
- this.title = title;
- this.content = content;
- this.links = new ArrayList<Link>();
- }
-
- public String getTitle() {
- return title;
- }
-
- public String getContent() {
- return content;
- }
-
- public boolean addLink(Link link) {
- return links.add(link);
- }
-
- public List<Link> getLinks() {
- return links;
- }
-
- public boolean hasLinks() {
- return !links.isEmpty();
- }
-
- @Override
- public String toString() {
- return "";
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
- Passage passage = (Passage) o;
- return title.equals(passage.title) && content.equals(passage.content) && Objects.equals(links, passage.links);
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(title, content, links);
- }
-}
\ No newline at end of file
--
GitLab