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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/D_Test1.java
new_repo
Komlovski 5 years ago
parent
952e88aec4 62c3e3ae86
commit
0da06b2611
15 changed files with 72 additions and 45 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. 103
      .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/D_Test2.class
  7. BIN
      out/production/Alpha/D_Test3.class
  8. BIN
      out/production/Alpha/Main$1.class
  9. BIN
      out/production/Alpha/Main$ActionListener1.class
  10. BIN
      out/production/Alpha/Main.class
  11. 4
      src/D_Test1.java
  12. 2
      src/D_Test2.java
  13. 2
      src/D_Test3.java
  14. 2
      src/E_Test.java
  15. 2
      src/M_Test.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_1_9" default="true" project-jdk-name="9" 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>

103
.idea/workspace.xml
View File

@ -2,8 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="41dc023d-0769-466f-850a-8e3eed9fe5fa" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Geburtstag.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Geburtstag.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/D_Test1.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/D_Test1.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -17,29 +16,21 @@
</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="236">
<caret line="33" selection-start-line="33" selection-end-line="38" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Geburtstag.java">
<entry file="file://$PROJECT_DIR$/src/D_Test1.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
<state relative-caret-position="238">
<caret line="14" column="24" selection-start-line="14" selection-start-column="24" selection-end-line="14" selection-end-column="24" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#191#192#0" expanded="true" />
<element signature="e#1397#1398#0" expanded="true" />
<element signature="e#1600#1601#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Alpha.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@ -55,11 +46,11 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/Main.java" />
<option value="$PROJECT_DIR$/src/testFrame.java" />
<option value="$PROJECT_DIR$/src/fenster.java" />
<option value="$PROJECT_DIR$/src/geburtstag.java" />
<option value="$PROJECT_DIR$/src/Geburtstag.java" />
<option value="$PROJECT_DIR$/src/Main.java" />
</list>
</option>
</component>
@ -69,13 +60,14 @@
<option name="width" value="1346" />
<option name="height" value="728" />
</component>
<component name="ProjectLevelVcsManager">
<ConfirmationsSetting value="2" id="Add" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -92,6 +84,8 @@
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@ -114,9 +108,16 @@
</list>
</option>
</component>
<component name="RunManager" selected="Application.Geburtstag">
<configuration name="Geburtstag" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Geburtstag" />
<component name="RunManager" selected="Application.D_Test1">
<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="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" />
@ -145,8 +146,9 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Application.Geburtstag" />
<item itemvalue="Application.D_Test1" />
<item itemvalue="Application.Main" />
<item itemvalue="Application.D_Geburtstag" />
<item itemvalue="Application.main" />
<item itemvalue="Application.fenster" />
</list>
@ -165,7 +167,8 @@
<workItem from="1562340912093" duration="26000" />
<workItem from="1562341014848" duration="1785000" />
<workItem from="1562343569757" duration="85000" />
<workItem from="1562343774281" duration="241000" />
<workItem from="1562343774281" duration="2056000" />
<workItem from="1562347057096" duration="199000" />
</task>
<task id="LOCAL-00001" summary="neue master">
<created>1562341097724</created>
@ -195,17 +198,37 @@
<option name="project" value="LOCAL" />
<updated>1562343454615</updated>
</task>
<option name="localTasksCounter" value="5" />
<task id="LOCAL-00005" summary="geburtstag sauber">
<created>1562344148629</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1562344148629</updated>
</task>
<task id="LOCAL-00006" summary="Main bereinigt">
<created>1562344619215</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1562344619215</updated>
</task>
<task id="LOCAL-00007" summary="junit klassen erst mal entfernen">
<created>1562346483053</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1562346483053</updated>
</task>
<option name="localTasksCounter" value="8" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2492000" />
<option name="totallyTimeSpent" value="4694000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1616" height="886" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2596401" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17287917" />
<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" />
@ -215,7 +238,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 anchor="bottom" id="Run" order="3" visible="true" weight="0.32934928" />
<window_info active="true" anchor="bottom" id="Run" order="3" visible="true" 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" />
@ -242,7 +265,9 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="neue master" />
<MESSAGE value="geburtstag sauber" />
<option name="LAST_COMMIT_MESSAGE" value="geburtstag sauber" />
<MESSAGE value="Main bereinigt" />
<MESSAGE value="junit klassen erst mal entfernen" />
<option name="LAST_COMMIT_MESSAGE" value="junit klassen erst mal entfernen" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/testJFrame.java" />
@ -250,20 +275,24 @@
<entry file="file://$PROJECT_DIR$/Alpha.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/TestBmi.java" />
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="33" selection-start-line="33" selection-end-line="38" selection-end-column="5" />
<caret line="29" column="5" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Geburtstag.java">
<entry file="file://$PROJECT_DIR$/src/D_Geburtstag.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
<state relative-caret-position="255">
<caret line="15" selection-start-line="15" selection-end-line="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/D_Test.java" />
<entry file="file://$PROJECT_DIR$/src/M_Test.java" />
<entry file="file://$PROJECT_DIR$/src/E_Test.java" />
</component>
<component name="masterDetails">
<states>

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/D_Test2.class
View File

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

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

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

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

4
src/D_Test.java → src/D_Test1.java
View File

@ -6,9 +6,7 @@ public class D_Test {
public class NewStudent {
public static void
(String[] args) {
public static void main(String[] args) {
NewStudent st = new NewStudent();
}

2
src/D_Test2.java
View File

@ -0,0 +1,2 @@
public class D_Test2 {
}

2
src/D_Test3.java
View File

@ -0,0 +1,2 @@
public class D_Test3 {
}

2
src/E_Test.java
View File

@ -1,2 +0,0 @@
public class E_Test {
}

2
src/M_Test.java
View File

@ -1,2 +0,0 @@
public class M_Test {
}
Write Preview
Loading…
Cancel
Save