Merge lp:~ouattchidi/mytuto/mytuto-client into lp:mytuto

Proposed by Rachid Ouattara
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ouattchidi/mytuto/mytuto-client
Merge into: lp:mytuto
Diff against target: 152 lines
6 files modified
Client/.classpath (+10/-0)
Client/.project (+25/-0)
Client/.settings/org.eclipse.jdt.core.prefs (+5/-0)
Client/.settings/org.maven.ide.eclipse.prefs (+9/-0)
Client/pom.xml (+11/-0)
Client/src/main/java/org/wati/tuto/client/ihm/MainFrame.java (+44/-0)
To merge this branch: bzr merge lp:~ouattchidi/mytuto/mytuto-client
To post a comment you must log in.
Revision history for this message
Rachid Ouattara (ouattchidi) wrote :

please add client module to the main one

Revision history for this message
Rachid Ouattara (ouattchidi) wrote :

I'll check your branch and let you know

> please add client module to the main one

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'Client'
2=== added file 'Client/.classpath'
3--- Client/.classpath 1970-01-01 00:00:00 +0000
4+++ Client/.classpath 2009-10-22 13:50:21 +0000
5@@ -0,0 +1,10 @@
6+<?xml version="1.0" encoding="UTF-8"?>
7+<classpath>
8+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
9+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
10+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
11+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
12+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
13+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
14+ <classpathentry kind="output" path="target/classes"/>
15+</classpath>
16
17=== added file 'Client/.project'
18--- Client/.project 1970-01-01 00:00:00 +0000
19+++ Client/.project 2009-10-22 13:50:21 +0000
20@@ -0,0 +1,25 @@
21+<?xml version="1.0" encoding="UTF-8"?>
22+<projectDescription>
23+ <name>Client</name>
24+ <comment></comment>
25+ <projects>
26+ </projects>
27+ <buildSpec>
28+ <buildCommand>
29+ <name>org.eclipse.jdt.core.javabuilder</name>
30+ <arguments>
31+ </arguments>
32+ </buildCommand>
33+ <buildCommand>
34+ <name>org.maven.ide.eclipse.maven2Builder</name>
35+ <arguments>
36+ </arguments>
37+ </buildCommand>
38+ </buildSpec>
39+ <natures>
40+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
41+ <nature>org.eclipse.jdt.core.javanature</nature>
42+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
43+ <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
44+ </natures>
45+</projectDescription>
46
47=== added directory 'Client/.settings'
48=== added file 'Client/.settings/org.eclipse.jdt.core.prefs'
49--- Client/.settings/org.eclipse.jdt.core.prefs 1970-01-01 00:00:00 +0000
50+++ Client/.settings/org.eclipse.jdt.core.prefs 2009-10-22 13:50:21 +0000
51@@ -0,0 +1,5 @@
52+#Thu Oct 22 15:36:46 CEST 2009
53+eclipse.preferences.version=1
54+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
55+org.eclipse.jdt.core.compiler.compliance=1.4
56+org.eclipse.jdt.core.compiler.source=1.3
57
58=== added file 'Client/.settings/org.maven.ide.eclipse.prefs'
59--- Client/.settings/org.maven.ide.eclipse.prefs 1970-01-01 00:00:00 +0000
60+++ Client/.settings/org.maven.ide.eclipse.prefs 2009-10-22 13:50:21 +0000
61@@ -0,0 +1,9 @@
62+#Thu Oct 22 15:36:46 CEST 2009
63+activeProfiles=
64+eclipse.preferences.version=1
65+fullBuildGoals=process-test-resources
66+includeModules=false
67+resolveWorkspaceProjects=true
68+resourceFilterGoals=process-resources resources\:testResources
69+skipCompilerPlugin=true
70+version=1
71
72=== added file 'Client/pom.xml'
73--- Client/pom.xml 1970-01-01 00:00:00 +0000
74+++ Client/pom.xml 2009-10-22 13:50:21 +0000
75@@ -0,0 +1,11 @@
76+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
77+ <parent>
78+ <artifactId>MyTuto</artifactId>
79+ <groupId>org.isidis</groupId>
80+ <version>0.0.1-SNAPSHOT</version>
81+ </parent>
82+ <modelVersion>4.0.0</modelVersion>
83+ <groupId>org.isidis</groupId>
84+ <artifactId>Client</artifactId>
85+ <version>0.0.1-SNAPSHOT</version>
86+</project>
87\ No newline at end of file
88
89=== added directory 'Client/src'
90=== added directory 'Client/src/main'
91=== added directory 'Client/src/main/java'
92=== added directory 'Client/src/main/java/org'
93=== added directory 'Client/src/main/java/org/wati'
94=== added directory 'Client/src/main/java/org/wati/tuto'
95=== added directory 'Client/src/main/java/org/wati/tuto/client'
96=== added directory 'Client/src/main/java/org/wati/tuto/client/ihm'
97=== added file 'Client/src/main/java/org/wati/tuto/client/ihm/MainFrame.java'
98--- Client/src/main/java/org/wati/tuto/client/ihm/MainFrame.java 1970-01-01 00:00:00 +0000
99+++ Client/src/main/java/org/wati/tuto/client/ihm/MainFrame.java 2009-10-22 13:50:21 +0000
100@@ -0,0 +1,44 @@
101+package org.wati.tuto.client.ihm;
102+
103+import java.awt.BorderLayout;
104+import javax.swing.JPanel;
105+import javax.swing.JFrame;
106+
107+public class MainFrame extends JFrame {
108+
109+ private static final long serialVersionUID = 1L;
110+ private JPanel jContentPane = null;
111+
112+ /**
113+ * This is the default constructor
114+ */
115+ public MainFrame() {
116+ super();
117+ initialize();
118+ }
119+
120+ /**
121+ * This method initializes this
122+ *
123+ * @return void
124+ */
125+ private void initialize() {
126+ this.setSize(300, 200);
127+ this.setContentPane(getJContentPane());
128+ this.setTitle("JFrame");
129+ }
130+
131+ /**
132+ * This method initializes jContentPane
133+ *
134+ * @return javax.swing.JPanel
135+ */
136+ private JPanel getJContentPane() {
137+ if (jContentPane == null) {
138+ jContentPane = new JPanel();
139+ jContentPane.setLayout(new BorderLayout());
140+ }
141+ return jContentPane;
142+ }
143+
144+}
145
146=== added directory 'Client/src/main/resources'
147=== added directory 'Client/src/test'
148=== added directory 'Client/src/test/java'
149=== added directory 'Client/src/test/resources'
150=== added directory 'Client/target'
151=== added directory 'Client/target/classes'
152=== added directory 'Client/target/test-classes'

Subscribers

People subscribed via source and target branches

to all changes: