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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	.idea/workspace.xml
new_repo
Hauch IT 5 years ago
parent
c7e8352f5c 222a99b1bd
commit
83472a2381
4 changed files with 66 additions and 83 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. 118
      .idea/workspace.xml
  3. BIN
      out/production/Alpha/Main.class
  4. 29
      src/Main.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_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="true" project-jdk-name="9" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

118
.idea/workspace.xml
View File

@ -3,7 +3,6 @@
<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/D_Test.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/D_Test.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -18,16 +17,19 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/D_Test.java">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="799">
<caret line="47" column="14" lean-forward="true" selection-start-line="47" selection-start-column="14" selection-end-line="47" selection-end-column="14" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#196#197#0" expanded="true" />
<element signature="e#1401#1402#0" expanded="true" />
<element signature="e#1604#1605#0" expanded="true" />
</folding>
<state relative-caret-position="236">
<caret line="29" column="5" lean-forward="true" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
</state>
</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="255">
<caret line="15" selection-start-line="15" selection-end-line="15" />
</state>
</provider>
</entry>
@ -52,7 +54,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/D_Test.java" />
</list>
</option>
</component>
@ -62,9 +63,6 @@
<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" />
@ -110,7 +108,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Application.D_Test1">
<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" />
@ -118,13 +116,6 @@
<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" />
</method>
</configuration>
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="Main" />
<module name="Alpha" />
@ -148,7 +139,6 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Application.D_Test1" />
<item itemvalue="Application.Main" />
<item itemvalue="Application.D_Geburtstag" />
<item itemvalue="Application.main" />
@ -170,7 +160,7 @@
<workItem from="1562341014848" duration="1785000" />
<workItem from="1562343569757" duration="85000" />
<workItem from="1562343774281" duration="2056000" />
<workItem from="1562347057096" duration="727000" />
<workItem from="1562347057096" duration="199000" />
</task>
<task id="LOCAL-00001" summary="neue master">
<created>1562341097724</created>
@ -221,32 +211,11 @@
<option name="project" value="LOCAL" />
<updated>1562346483053</updated>
</task>
<task id="LOCAL-00008" summary="neue Klassen hinzugefügt, für Tests.">
<created>1562347496252</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1562347496252</updated>
</task>
<task id="LOCAL-00009" summary="neue Klassen hinzugefügt, für Tests.">
<created>1562347599281</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1562347599281</updated>
</task>
<task id="LOCAL-00010" summary="neue Klassen hinzugefügt, für Tests.">
<created>1562347624079</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1562347624079</updated>
</task>
<option name="localTasksCounter" value="11" />
<option name="localTasksCounter" value="8" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="5034000" />
<option name="totallyTimeSpent" value="4685000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1616" height="886" extended-state="6" />
@ -262,19 +231,19 @@
<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" 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" />
<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" weight="0.32934928" />
<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" visible="true" weight="0.32934928" />
<window_info anchor="bottom" id="Terminal" order="11" weight="0.32934928" />
<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 active="true" anchor="right" content_ui="combo" id="Hierarchy" order="2" visible="true" 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" />
@ -291,8 +260,7 @@
<MESSAGE value="geburtstag sauber" />
<MESSAGE value="Main bereinigt" />
<MESSAGE value="junit klassen erst mal entfernen" />
<MESSAGE value="neue Klassen hinzugefügt, für Tests." />
<option name="LAST_COMMIT_MESSAGE" value="neue Klassen hinzugefügt, für Tests." />
<option name="LAST_COMMIT_MESSAGE" value="junit klassen erst mal entfernen" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/testJFrame.java" />
@ -301,17 +269,10 @@
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/TestBmi.java" />
<entry file="file://$PROJECT_DIR$/src/E_Test.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="19" selection-start-column="19" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/M_Test.java">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="19" selection-start-column="19" selection-end-column="19" />
<state relative-caret-position="236">
<caret line="29" column="5" selection-start-line="29" selection-start-column="5" selection-end-line="29" selection-end-column="5" />
</state>
</provider>
</entry>
@ -322,26 +283,35 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<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/D_Test.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="799">
<caret line="47" column="14" lean-forward="true" selection-start-line="47" selection-start-column="14" selection-end-line="47" selection-end-column="14" />
<caret line="47" column="9" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#196#197#0" expanded="true" />
<element signature="e#1401#1402#0" expanded="true" />
<element signature="e#168#169#0" expanded="true" />
<element signature="e#222#223#0" expanded="true" />
<element signature="e#1341#1342#0" expanded="true" />
<element signature="e#1403#1404#0" expanded="true" />
<element signature="e#1540#1541#0" expanded="true" />
<element signature="e#1604#1605#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/M_Test.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="19" selection-start-column="19" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/E_Test.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="19" selection-start-column="19" selection-end-column="19" />
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

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

29
src/Main.java
View File

@ -1,5 +1,6 @@
import javax.swing.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class Main {
//Variablen GUI
@ -8,7 +9,7 @@ public class Main {
JMenu jm = null;
JPanel contantPane = null;
JLabel label = null;
JMenuItem jmI = null;
//Konstruktor Gui
public Main(){
this.fr = new JFrame("Coutinius Integration");
@ -18,19 +19,31 @@ public class Main {
this.fr.setJMenuBar(jmb);
this.jm = new JMenu("File");
this.jmb.add(jm);
this.jmI = new JMenuItem("Exit");
this.jm.add(jmI);
this.jmI.addActionListener(new ActionListener1());
this.contantPane = new JPanel();
fr.setContentPane(contantPane);
contantPane.add(new JLabel("Beispiel JLabel"));
// Wir lassen unseren Frame anzeigen
contantPane.setVisible(true);
fr.setVisible(true);
this.fr.setContentPane(contantPane);
this.contantPane.add(new JLabel("Beispiel JLabel"));
this.contantPane.setVisible(true);
this.fr.setVisible(true);
}
public static void main(String[] args) {
System.out.println("Hello World!");
Main mn = new Main();
}
// Action Listener
private class ActionListener1 implements ActionListener{
@Override
public void actionPerformed(ActionEvent e) {
System.exit(0);
}
}
}
Write Preview
Loading…
Cancel
Save