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
#	out/production/Alpha/Main.class
new_repo
MSeibert97 6 years ago
parent
231d90d4ec 7bd8d54595
commit
61b3a09485
5 changed files with 150 additions and 125 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. 226
      .idea/workspace.xml
  2. BIN
      out/production/Alpha/META-INF/Alpha.kotlin_module
  3. BIN
      out/production/Alpha/Main.class
  4. 19
      src/Geburtstag.java
  5. 30
      src/Main.java

226
.idea/workspace.xml
View File

@ -2,12 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="41dc023d-0769-466f-850a-8e3eed9fe5fa" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/Bmi.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/TestBmi.java" 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$/Alpha.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Alpha.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/Alpha/Main.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/Alpha/Main.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Geburtstag.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Geburtstag.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -17,44 +13,31 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DefaultGradleProjectSettings">
<option name="testRunner" value="GRADLE" />
<option name="delegatedBuild" value="true" />
<option name="isMigrated" value="true" />
</component>
<component name="FileEditorManager">
<leaf>
<file pinned="false" current-in-tab="true">
<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>
<caret column="13" selection-start-column="13" selection-end-column="13" />
<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="false">
<entry file="file://$PROJECT_DIR$/src/TestBmi.java">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Geburtstag.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="201">
<caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
<folding>
<element signature="e#81#82#0" expanded="true" />
<element signature="e#111#112#0" expanded="true" />
</folding>
<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>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Bmi.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="5" lean-forward="true" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
<folding>
<element signature="e#73#74#0" expanded="true" />
<element signature="e#119#120#0" expanded="true" />
</folding>
</state>
</provider>
<entry file="file://$PROJECT_DIR$/Alpha.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
</leaf>
@ -72,22 +55,27 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/src/Bmi.java" />
<option value="$PROJECT_DIR$/src/TestBmi.java" />
<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" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-9" />
<option name="y" value="-9" />
<option name="width" value="1347" />
<option name="height" value="729" />
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1346" />
<option name="height" value="728" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -95,16 +83,6 @@
<item name="Alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="Alpha" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="Alpha" type="462c0819:PsiDirectoryNode" />
<item name=".idea" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="Alpha" type="462c0819:PsiDirectoryNode" />
<item name="out" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Alpha" type="b2602c69:ProjectViewProjectNode" />
<item name="Alpha" type="462c0819:PsiDirectoryNode" />
@ -114,15 +92,9 @@
<select />
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="Downloaded.Files.Path.Enabled" value="false" />
<property name="Repository.Attach.Annotations" value="false" />
<property name="Repository.Attach.JavaDocs" value="false" />
<property name="Repository.Attach.Sources" value="false" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" />
@ -130,11 +102,6 @@
<property name="project.structure.proportion" value="0.0" />
<property name="project.structure.side.proportion" value="0.0" />
</component>
<component name="RecentsManager">
<key name="CreateClassDialog.RecentsKey">
<recent name="" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
@ -147,7 +114,14 @@
</list>
</option>
</component>
<component name="RunManager" selected="JUnit.TestBmi">
<component name="RunManager" selected="Application.Geburtstag">
<configuration name="Geburtstag" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="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" />
<module name="Alpha" />
@ -155,30 +129,26 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TestBmi" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<configuration name="fenster" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="fenster" />
<module name="Alpha" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="TestBmi" />
<option name="TEST_OBJECT" value="class" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="TestBmi.normalBmi" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
<configuration name="main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="main" />
<module name="Alpha" />
<option name="PACKAGE_NAME" value="" />
<option name="MAIN_CLASS_NAME" value="TestBmi" />
<option name="METHOD_NAME" value="normalBmi" />
<option name="TEST_OBJECT" value="method" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<recent_temporary>
<list>
<item itemvalue="JUnit.TestBmi" />
<item itemvalue="JUnit.TestBmi.normalBmi" />
<item itemvalue="Application.Geburtstag" />
<item itemvalue="Application.Main" />
<item itemvalue="Application.main" />
<item itemvalue="Application.fenster" />
</list>
</recent_temporary>
</component>
@ -193,50 +163,68 @@
<option name="presentableId" value="Default" />
<updated>1562340910388</updated>
<workItem from="1562340912093" duration="26000" />
<workItem from="1562341014848" duration="1785000" />
<workItem from="1562343569757" duration="85000" />
<workItem from="1562343774281" duration="241000" />
</task>
<task id="LOCAL-00001" summary="neue master">
<created>1562341097724</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1562341097724</updated>
</task>
<task id="LOCAL-00002" summary="neue master">
<created>1562341184106</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1562341184106</updated>
</task>
<task id="LOCAL-00003" summary="geburtstag sauber">
<created>1562343360954</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1562343360954</updated>
</task>
<task id="LOCAL-00004" summary="geburtstag sauber">
<created>1562343454615</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1562343454615</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers />
</component>
<component name="TestHistory">
<history-entry file="TestBmi - 2019.07.05 at 18h 28m 01s.xml">
<configuration name="TestBmi" configurationId="JUnit" />
</history-entry>
<history-entry file="TestBmi - 2019.07.05 at 18h 32m 24s.xml">
<configuration name="TestBmi" configurationId="JUnit" />
</history-entry>
<history-entry file="TestBmi - 2019.07.05 at 18h 34m 00s.xml">
<configuration name="TestBmi" configurationId="JUnit" />
</history-entry>
<history-entry file="TestBmi - 2019.07.05 at 18h 34m 30s.xml">
<configuration name="TestBmi" configurationId="JUnit" />
</history-entry>
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="26000" />
<option name="totallyTimeSpent" value="2492000" />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="-7" width="1295" height="695" extended-state="6" />
<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.254251" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2596401" />
<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" weight="0.3285968" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" weight="0.3285968" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Database Changes" order="9" />
<window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.38543516" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<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 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 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 anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@ -251,40 +239,28 @@
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="neue master" />
<MESSAGE value="geburtstag sauber" />
<option name="LAST_COMMIT_MESSAGE" value="geburtstag sauber" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/test.java">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="17" selection-start-column="17" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TestBmi.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="201">
<caret line="16" column="16" selection-start-line="16" selection-start-column="16" selection-end-line="16" selection-end-column="16" />
<folding>
<element signature="e#81#82#0" expanded="true" />
<element signature="e#111#112#0" expanded="true" />
</folding>
</state>
</provider>
<entry file="file://$PROJECT_DIR$/src/testJFrame.java" />
<entry file="file://$PROJECT_DIR$/src/fenster.java" />
<entry file="file://$PROJECT_DIR$/Alpha.iml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/Bmi.java">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="68">
<caret line="4" column="5" lean-forward="true" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
<folding>
<element signature="e#73#74#0" expanded="true" />
<element signature="e#119#120#0" expanded="true" />
</folding>
<state relative-caret-position="236">
<caret line="33" selection-start-line="33" selection-end-line="38" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Main.java">
<entry file="file://$PROJECT_DIR$/src/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="272">
<caret line="16" column="8" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="8" />
</state>
</provider>
</entry>

BIN
out/production/Alpha/META-INF/Alpha.kotlin_module
View File

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

19
src/Geburtstag.java
View File

@ -0,0 +1,19 @@
public class Geburtstag {
public Geburtstag(){
Main mn1 = new Main();
}
public static void main(String[] args) {
Geburtstag gb = new Geburtstag();
}
}

30
src/Main.java
View File

@ -1,6 +1,36 @@
import javax.swing.*;
public class Main {
//Variablen GUI
JFrame fr = null;
JMenuBar jmb = null;
JMenu jm = null;
JPanel contantPane = null;
JLabel label = null;
//Konstruktor Gui
public Main(){
this.fr = new JFrame("Coutinius Integration");
this.fr.setSize(666,900);
this.jmb = new JMenuBar();
this.fr.setJMenuBar(jmb);
this.jm = new JMenu("File");
this.jmb.add(jm);
this.contantPane = new JPanel();
fr.setContentPane(contantPane);
contantPane.add(new JLabel("Beispiel JLabel"));
// Wir lassen unseren Frame anzeigen
contantPane.setVisible(true);
fr.setVisible(true);
}
public static void main(String[] args) {
System.out.println("Hello World!");
Main mn = new Main();
}
}
Write Preview
Loading…
Cancel
Save