Merge branch 'damba' of ssh://mecka.net/home/git/yalp into damba

Conflicts:
	build.xml
	server.policy

Signed-off-by: Manuel Traut <manut@mecka.net>

1 files changed, 61 insertions, 61 deletions

diff --git a/src/YalpClients/SwtClient/SwtClient.java b/src/YalpClients/SwtClient/SwtClient.java
index 513d4ff..1950eaa 100755
--- a/src/YalpClients/SwtClient/SwtClient.java
+++ b/src/YalpClients/SwtClient/SwtClient.java
@@ -1,61 +1,61 @@
-/*

- *

- * Copyright (c) 2006 Manuel Traut and Volker Dahnke

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Common Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/cpl-v10.html

- *

- * Contributors: Manuel Traut and Volker Dahnke

- *

- */

-package YalpClients.SwtClient;

-

-import YalpClients.SwtClient.GUI.*;

-

-import org.eclipse.swt.*;

-import org.eclipse.swt.widgets.Display;

-import org.eclipse.swt.widgets.Shell;

-

-

-/*

- * Class SwtClient

- *

- * <em>static main method</em>

- *

- * @author Volker Dahnke / Manuel Traut

- *

- * @version 0.1 20-11-2005<br>

- */

-public class SwtClient{

-

-/*

- *  Client initialization

- *

- *  @param argv

- *      arguments which are not used

- */

-	public static void main (String[] argv) {

-		try{

-			System.setProperty("java.security.policy","client.policy");

-		}

-		catch (Exception e) {//DEBUG

-			System.out.println ("Server SecurityManagerExeptions not caught jet " + e);

-			System.exit(0);

-		}

-

-		LoadDialog load = new LoadDialog(

-			new Shell(Display.getDefault(),SWT.NONE), SWT.NONE);

-

-		load.show();

-		final Model model = new Model(argv);

-		load.close();

-

-		StartDialog start =

-			new StartDialog(new Shell(Display.getDefault(),SWT.MIN),model, SWT.NONE);

-

-		start.show();

-

-		return;

-	}

-}

+/*
+ *
+ * Copyright (c) 2006 Manuel Traut and Volker Dahnke
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors: Manuel Traut and Volker Dahnke
+ *
+ */
+package YalpClients.SwtClient;
+
+import YalpClients.SwtClient.GUI.*;
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+
+
+/*
+ * Class SwtClient
+ *
+ * <em>static main method</em>
+ *
+ * @author Volker Dahnke / Manuel Traut
+ *
+ * @version 0.1 20-11-2005<br>
+ */
+public class SwtClient{
+
+/*
+ *  Client initialization
+ *
+ *  @param argv
+ *      arguments which are not used
+ */
+	public static void main (String[] argv) {
+		try{
+			System.setProperty("java.security.policy","client.policy");
+		}
+		catch (Exception e) {//DEBUG
+			System.out.println ("Server SecurityManagerExeptions not caught jet " + e);
+			System.exit(0);
+		}
+
+		LoadDialog load = new LoadDialog(
+			new Shell(Display.getDefault(),SWT.NONE), SWT.NONE);
+
+		load.show();
+		final Model model = new Model(argv);
+		load.close();
+
+		StartDialog start =
+			new StartDialog(new Shell(Display.getDefault(),SWT.MIN),model, SWT.NONE);
+
+		start.show();
+
+		return;
+	}
+}