Hauch
/
Alpha
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of C:\Users\dh\IdeaProjects\Alpha with conflicts.

new_repo
Hauch IT 5 years ago
parent
46cc8d8081
commit
574ab569bd
10 changed files with 71 additions and 141 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .idea/misc.xml
  2. 210
      .idea/workspace.xml
  3. BIN
      out/production/Alpha/D_Test1$1.class
  4. BIN
      out/production/Alpha/D_Test1$2.class
  5. BIN
      out/production/Alpha/D_Test1.class
  6. BIN
      out/production/Alpha/Main$1.class
  7. BIN
      out/production/Alpha/Main$2.class
  8. BIN
      out/production/Alpha/Main$ActionListener1.class
  9. BIN
      out/production/Alpha/Main.class
  10. 0
      src/Tage_D.java

2
.idea/misc.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

210
.idea/workspace.xml
View File

@ -2,8 +2,15 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="41dc023d-0769-466f-850a-8e3eed9fe5fa" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/out/production/Alpha/Main$2.class" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/Alpha/Quiz_E.class" afterDir="false" />
<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$/out/production/Alpha/D_Test1$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/Alpha/D_Test1$2.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/Alpha/D_Test1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/Alpha/Main$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/Alpha/Main$1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/Alpha/Main$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/Alpha/Main$2.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/Alpha/Main$ActionListener1.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/Alpha/Main$ActionListener1.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/Alpha/Main.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/Alpha/Main.class" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -17,45 +24,26 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="355">
<caret line="93" selection-start-line="93" selection-end-line="93" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1752#1753#0" expanded="true" />
<element signature="e#1805#1806#0" expanded="true" />
<element signature="e#1930#1931#0" expanded="true" />
<element signature="e#1985#1986#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Quiz_E.java">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="66" column="40" selection-start-line="66" selection-start-column="40" selection-end-line="66" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="425">
<caret line="27" selection-start-line="27" selection-end-line="27" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/D_Test2.java">
<entry file="file://$PROJECT_DIR$/src/D_Geburtstag.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="13" selection-start-column="13" selection-end-column="13" />
<state relative-caret-position="323">
<caret line="19" selection-start-line="15" selection-end-line="19" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/D_Test3.java">
<entry file="file://$PROJECT_DIR$/src/D_Test2.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="13" selection-start-column="13" selection-end-column="13" />
@ -63,15 +51,6 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/D_Geburtstag.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" selection-start-line="8" selection-end-line="8" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@ -81,6 +60,14 @@
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>pa.</find>
</findStrings>
<replaceStrings>
<replace>this.</replace>
</replaceStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
@ -92,9 +79,6 @@
<option value="$PROJECT_DIR$/src/geburtstag.java" />
<option value="$PROJECT_DIR$/src/Geburtstag.java" />
<option value="$PROJECT_DIR$/src/Main.java" />
<option value="$PROJECT_DIR$/src/TicTakToc_E_K.java" />
<option value="$PROJECT_DIR$/src/Quiz.java" />
<option value="$PROJECT_DIR$/src/Quiz_E.java" />
</list>
</option>
</component>
@ -128,8 +112,8 @@
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@ -137,7 +121,7 @@
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
<property name="project.structure.last.edited" value="Project" />
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.0" />
</component>
<component name="RunDashboard">
@ -152,37 +136,37 @@
</list>
</option>
</component>
<component name="RunManager" selected="Application.Quiz_E">
<configuration name="TicTakToc_E_K" type="Applet" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="TicTakToc_E_K" />
<component name="RunManager" selected="Application.Main">
<configuration name="D_Geburtstag" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="D_Geburtstag" />
<module name="Alpha" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Main" />
<configuration name="D_Test1" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="D_Test1" />
<module name="Alpha" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Quiz" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Quiz" />
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Main" />
<module name="Alpha" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="Quiz_E" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Quiz_E" />
<configuration name="fenster" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="fenster" />
<module name="Alpha" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TicTakToc_E_K" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="TicTakToc_E_K" />
<configuration name="main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="main" />
<module name="Alpha" />
<method v="2">
<option name="Make" enabled="true" />
@ -190,11 +174,11 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Application.Quiz_E" />
<item itemvalue="Application.Quiz" />
<item itemvalue="Applet.TicTakToc_E_K" />
<item itemvalue="Application.TicTakToc_E_K" />
<item itemvalue="Application.Main" />
<item itemvalue="Application.D_Test1" />
<item itemvalue="Application.D_Geburtstag" />
<item itemvalue="Application.main" />
<item itemvalue="Application.fenster" />
</list>
</recent_temporary>
</component>
@ -213,8 +197,8 @@
<workItem from="1562343569757" duration="85000" />
<workItem from="1562343774281" duration="2056000" />
<workItem from="1562347057096" duration="199000" />
<workItem from="1562363354568" duration="615000" />
<workItem from="1562414362573" duration="942000" />
<workItem from="1562379817416" duration="627000" />
<workItem from="1562534024971" duration="213000" />
</task>
<task id="LOCAL-00001" summary="neue master">
<created>1562341097724</created>
@ -272,54 +256,30 @@
<option name="project" value="LOCAL" />
<updated>1562348184129</updated>
</task>
<task id="LOCAL-00009" summary="Beginn mit Quiz Spiel.&#10;//erste Giu elemente">
<created>1562415232279</created>
<task id="LOCAL-00009" summary="Fenster wird um Auswahl Fenster erweitert">
<created>1562349172389</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1562415232279</updated>
<updated>1562349172389</updated>
</task>
<task id="LOCAL-00010" summary="Fenster wird um Auswahl Fenster erweitert">
<created>1562349989934</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1562349989934</updated>
</task>
<option name="localTasksCounter" value="10" />
<option name="localTasksCounter" value="11" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="11107000" />
<option name="totallyTimeSpent" value="7540000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="784" extended-state="6" />
<frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2655068" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" />
<window_info id="UI Designer" order="4" />
<window_info id="Capture Tool" order="5" />
<window_info id="Favorites" order="6" side_tool="true" />
<window_info anchor="bottom" id="Messages" order="0" sideWeight="0.4977307" weight="0.32872504" />
<window_info anchor="bottom" id="Message" order="1" />
<window_info anchor="bottom" id="Find" order="2" />
<window_info anchor="bottom" id="Run" order="3" sideWeight="0.4969743" weight="0.32872504" />
<window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="7" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" />
<window_info anchor="bottom" id="Database Changes" order="10" />
<window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.49924356" visible="true" weight="0.32872504" />
<window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50075644" side_tool="true" visible="true" weight="0.32872504" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Palette" order="3" />
<window_info anchor="right" id="Theme Preview" order="4" />
<window_info anchor="right" id="Maven" order="5" />
<window_info anchor="right" id="Capture Analysis" order="6" />
<window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Database" order="8" />
</layout>
<layout-to-restore>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25416037" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17643923" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Image Layers" order="2" />
<window_info id="Designer" order="3" />
@ -329,7 +289,7 @@
<window_info anchor="bottom" id="Messages" order="0" weight="0.32934928" />
<window_info anchor="bottom" id="Message" order="1" />
<window_info anchor="bottom" id="Find" order="2" />
<window_info active="true" anchor="bottom" id="Run" order="3" sideWeight="0.49924356" visible="true" weight="0.32872504" />
<window_info anchor="bottom" id="Run" order="3" weight="0.32934928" />
<window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
@ -338,7 +298,7 @@
<window_info anchor="bottom" id="Version Control" order="9" />
<window_info anchor="bottom" id="Database Changes" order="10" />
<window_info anchor="bottom" id="Terminal" order="11" weight="0.32934928" />
<window_info anchor="bottom" id="Event Log" order="12" sideWeight="0.50075644" side_tool="true" visible="true" weight="0.32872504" />
<window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@ -348,7 +308,7 @@
<window_info anchor="right" id="Capture Analysis" order="6" />
<window_info anchor="right" id="Palette&#9;" order="7" />
<window_info anchor="right" id="Database" order="8" />
</layout-to-restore>
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
@ -358,11 +318,8 @@
<MESSAGE value="geburtstag sauber" />
<MESSAGE value="Main bereinigt" />
<MESSAGE value="junit klassen erst mal entfernen" />
<MESSAGE value="Beginn mit Quiz Spiel.&#10;//erste Giu elemente" />
<option name="LAST_COMMIT_MESSAGE" value="Beginn mit Quiz Spiel.&#10;//erste Giu elemente" />
</component>
<component name="com.intellij.coverage.CoverageDataManagerImpl">
<SUITE FILE_PATH="coverage/Alpha$Quiz.ic" NAME="Quiz Coverage Results" MODIFIED="1562358075708" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
<MESSAGE value="Fenster wird um Auswahl Fenster erweitert" />
<option name="LAST_COMMIT_MESSAGE" value="Fenster wird um Auswahl Fenster erweitert" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/testJFrame.java" />
@ -387,14 +344,14 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/D_Test1.java" />
<entry file="file://$PROJECT_DIR$/src/D_Test2.java">
<entry file="file://$PROJECT_DIR$/Info Datei Nur für Alpha">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="13" selection-start-column="13" selection-end-column="13" />
<state relative-caret-position="143">
<caret line="33" column="20" selection-start-line="33" selection-start-column="20" selection-end-line="33" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/D_Test3.java">
<entry file="file://$PROJECT_DIR$/src/D_Test2.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="13" selection-start-column="13" selection-end-column="13" />
@ -403,42 +360,15 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/D_Geburtstag.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" selection-start-line="8" selection-end-line="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Quiz.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="17" column="2" lean-forward="true" selection-start-line="17" selection-start-column="2" selection-end-line="17" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="323">
<caret line="19" lean-forward="true" selection-start-line="15" selection-end-line="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="355">
<caret line="93" selection-start-line="93" selection-end-line="93" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#1752#1753#0" expanded="true" />
<element signature="e#1805#1806#0" expanded="true" />
<element signature="e#1930#1931#0" expanded="true" />
<element signature="e#1985#1986#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Quiz_E.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="66" column="40" selection-start-line="66" selection-start-column="40" selection-end-line="66" selection-end-column="40" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="425">
<caret line="27" selection-start-line="27" selection-end-line="27" />
</state>
</provider>
</entry>

BIN
out/production/Alpha/D_Test1$1.class
View File

BIN
out/production/Alpha/D_Test1$2.class
View File

BIN
out/production/Alpha/D_Test1.class
View File

BIN
out/production/Alpha/Main$1.class
View File

BIN
out/production/Alpha/Main$2.class
View File

BIN
out/production/Alpha/Main$ActionListener1.class
View File

BIN
out/production/Alpha/Main.class
View File

0
src/D_Geburtstag.java → src/Tage_D.java
View File

Write Preview
Loading…
Cancel
Save