Menu
▾
▴
magicmap-commits — SVN commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(14) |
Mar
|
Apr
(4) |
May
(57) |
Jun
(14) |
Jul
(15) |
Aug
(5) |
Sep
(29) |
Oct
(13) |
Nov
(44) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(14) |
Feb
(78) |
Mar
(55) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(12) |
Dec
(9) |
| 2007 |
Jan
(21) |
Feb
(67) |
Mar
(39) |
Apr
(28) |
May
(7) |
Jun
|
Jul
(6) |
Aug
(2) |
Sep
(1) |
Oct
(18) |
Nov
(8) |
Dec
(11) |
| 2008 |
Jan
(16) |
Feb
(12) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Florian L. <fle...@us...> - 2005-09-28 15:53:11
|
Update of /cvsroot/magicmap/magicmapclient/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11202/res Modified Files: screentext.properties screentext_de_DE.properties Log Message: view options menu started Index: screentext_de_DE.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/screentext_de_DE.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** screentext_de_DE.properties 8 Jul 2005 16:59:41 -0000 1.3 --- screentext_de_DE.properties 28 Sep 2005 15:53:04 -0000 1.4 *************** *** 4,10 **** --- 4,15 ---- disconnect=&Trennen exit=B&eenden + view=&Anzeige options=&Optionen about=&Info über... help=&Hilfe + simpleview=Anfänger + normalview=Fortgeschritten + expertview=Experte + userdefinedview=&Benuzerdefiniert... connect_to_server=Mit Server verbinden disconnect_from_server=Vom Server trennen Index: screentext.properties =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/screentext.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** screentext.properties 11 May 2005 10:50:58 -0000 1.2 --- screentext.properties 28 Sep 2005 15:53:04 -0000 1.3 *************** *** 4,10 **** --- 4,15 ---- disconnect=&Disconnect exit=E&xit + view=&View options=&Options about=&About... help=&Help + simpleview=Beginner + normalview=Advanced + expertview=Expert + userdefinedview=&User-defined... connect_to_server=Connect to server disconnect_from_server=Disconnect from server |
|
From: Florian L. <fle...@us...> - 2005-09-28 13:39:37
|
Update of /cvsroot/magicmap/magicmapclient/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8212/dist Added Files: .cvsignore Log Message: --- NEW FILE: .cvsignore --- magicmap.jar |
|
From: Florian L. <fle...@us...> - 2005-09-28 13:38:05
|
Update of /cvsroot/magicmap/magicmapclient/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7966/dist Removed Files: magicmap.jar .cvsignore Log Message: --- .cvsignore DELETED --- --- magicmap.jar DELETED --- |
|
From: Florian L. <fle...@us...> - 2005-09-28 13:33:53
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6889/src/net/sf/magicmap/client/gui/utils Modified Files: RelativePanelBuilder.java Log Message: fehler in relative PanelBuilder gefixt (setWidth, setHeight) Index: RelativePanelBuilder.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/utils/RelativePanelBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RelativePanelBuilder.java 11 May 2005 10:51:30 -0000 1.2 --- RelativePanelBuilder.java 28 Sep 2005 13:33:35 -0000 1.3 *************** *** 17,20 **** --- 17,21 ---- import javax.swing.JTextField; + import com.brunchboy.util.swing.relativelayout.Attribute; import com.brunchboy.util.swing.relativelayout.AttributeConstraint; import com.brunchboy.util.swing.relativelayout.AttributeType; *************** *** 155,163 **** public void setWidth(String name, int w){ ! layout.addConstraint(name, AttributeType.WIDTH, new AttributeConstraint(name, AttributeType.LEFT, w)); } public void setHeight(String name, int h){ ! layout.addConstraint(name, AttributeType.HEIGHT, new AttributeConstraint(name, AttributeType.TOP, h)); } --- 156,164 ---- public void setWidth(String name, int w){ ! layout.addConstraint(name, AttributeType.WIDTH, new AttributeConstraint(DependencyManager.ROOT_NAME, AttributeType.LEFT, w )); } public void setHeight(String name, int h){ ! layout.addConstraint(name, AttributeType.HEIGHT, new AttributeConstraint(DependencyManager.ROOT_NAME, AttributeType.TOP, h)); } |
|
From: Florian L. <fle...@us...> - 2005-09-28 13:33:43
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6889/src/net/sf/magicmap/client/gui/dialogs Modified Files: AboutDialog.java Log Message: fehler in relative PanelBuilder gefixt (setWidth, setHeight) Index: AboutDialog.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AboutDialog.java 28 Sep 2005 10:33:07 -0000 1.2 --- AboutDialog.java 28 Sep 2005 13:33:35 -0000 1.3 *************** *** 48,53 **** builder.setTop("okbutton",this.getHeight()-60); builder.setLeft("okbutton",this.getWidth()-83); ! builder.setHeight("okbutton",27 - (this.getHeight()-60)); ! builder.setWidth("okbutton",75 - (this.getWidth()-83)); --- 48,53 ---- builder.setTop("okbutton",this.getHeight()-60); builder.setLeft("okbutton",this.getWidth()-83); ! builder.setHeight("okbutton",27 ); ! builder.setWidth("okbutton",75); *************** *** 69,73 **** JLabel magicMapImage = builder.addLabel("","magicmapimage",58,0); ! builder.setWidth("magicmapimage",284); builder.setHeight("magicmapimage",222); magicMapImage.setIcon(new ImageIcon(this.getClass().getClassLoader().getResource("MagicMapLogo.gif"))); --- 69,73 ---- JLabel magicMapImage = builder.addLabel("","magicmapimage",58,0); ! builder.setWidth("magicmapimage",342); builder.setHeight("magicmapimage",222); magicMapImage.setIcon(new ImageIcon(this.getClass().getClassLoader().getResource("MagicMapLogo.gif"))); |
|
From: Florian L. <fle...@us...> - 2005-09-28 12:44:15
|
Update of /cvsroot/magicmap/magicmapclient/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27163/res Modified Files: aboutText.html Log Message: umlaute durch html-maskierung ersetztz Index: aboutText.html =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/aboutText.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** aboutText.html 28 Sep 2005 10:33:07 -0000 1.2 --- aboutText.html 28 Sep 2005 12:44:06 -0000 1.3 *************** *** 10,20 **** <br> <br> ! Humboldt-Universität zu Berlin <br> ! Institut für Informatik <br> <br> ! Tobias Huebner <br> Florian Lederer <br> Martin Schweigert <br> ! Andreas Weiß <br> Peter Ibach <br> Vladimir Stantchev --- 10,20 ---- <br> <br> ! Humboldt-Universität zu Berlin <br> ! Institut für Informatik <br> <br> ! Tobias Hübner <br> Florian Lederer <br> Martin Schweigert <br> ! Andreas Weiß <br> Peter Ibach <br> Vladimir Stantchev |
|
From: Florian L. <fle...@us...> - 2005-09-28 10:33:23
|
Update of /cvsroot/magicmap/magicmapclient/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30462/lib Added Files: ostermillerutils_1_05_00.jar Log Message: homepagelink ist nun klickable --- NEW FILE: ostermillerutils_1_05_00.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Florian L. <fle...@us...> - 2005-09-28 10:33:23
|
Update of /cvsroot/magicmap/magicmapclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30462 Modified Files: start.sh start.bat .classpath Log Message: homepagelink ist nun klickable Index: .classpath =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/.classpath,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** .classpath 11 May 2005 15:45:03 -0000 1.4 --- .classpath 28 Sep 2005 10:33:07 -0000 1.5 *************** *** 27,30 **** --- 27,31 ---- <classpathentry kind="lib" path="lib/jpox-20041204.032009.jar"/> <classpathentry kind="lib" path="lib/log4j-1.2.8.jar"/> + <classpathentry kind="lib" path="lib/ostermillerutils_1_05_00.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Index: start.bat =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/start.bat,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** start.bat 31 May 2005 12:49:58 -0000 1.3 --- start.bat 28 Sep 2005 10:33:07 -0000 1.4 *************** *** 1,3 **** ! java -cp "dist\magicmap.jar;lib\activation.jar;lib\axis.jar;lib\colt.jar;lib\forms-1.0.5.jar;lib\looks-1.2.2.jar;lib\mail.jar;lib\magicmapclient.jar;lib\RelativeLayout.jar;lib\xml-apis.jar;lib\commons-collections-3.1.jar;lib\concurrent.jar;lib\looks-1.2.2.jar;lib\xercesImpl.jar;lib\xmlParserAPIs.jar;lib\wsdl4j.jar;lib\saaj.jar;lib\jaxrpc.jar;lib\commons-logging.jar;lib\commons-discovery.jar;lib\axis.jar;lib\log4j-1.2.8.jar;lib\jung-1.5.2.jar" net.sf.magicmap.client.gui.MainGUI --- 1,3 ---- ! java -cp "dist\magicmap.jar;lib\activation.jar;lib\axis.jar;lib\colt.jar;lib\forms-1.0.5.jar;lib\looks-1.2.2.jar;lib\mail.jar;lib\magicmapclient.jar;lib\RelativeLayout.jar;lib\xml-apis.jar;lib\commons-collections-3.1.jar;lib\concurrent.jar;lib\looks-1.2.2.jar;lib\xercesImpl.jar;lib\xmlParserAPIs.jar;lib\wsdl4j.jar;lib\saaj.jar;lib\jaxrpc.jar;lib\commons-logging.jar;lib\commons-discovery.jar;lib\axis.jar;lib\log4j-1.2.8.jar;lib\jung-1.5.2.jar;lib\ostermillerutils_1_05_00.jar" net.sf.magicmap.client.gui.MainGUI Index: start.sh =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/start.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** start.sh 8 Jun 2005 11:43:38 -0000 1.3 --- start.sh 28 Sep 2005 10:33:07 -0000 1.4 *************** *** 1,4 **** #!/bin/sh ! export CLASSPATH="dist/magicmap.jar:lib/activation.jar:lib/axis.jar:lib/colt.jar:lib/forms-1.0.5.jar:lib/looks-1.2.2.jar:lib/mail.jar:lib/magicmapclient.jar:lib/RelativeLayout.jar:lib/xml-apis.jar:lib/commons-collections-3.1.jar:lib/concurrent.jar:lib/looks-1.2.2.jar:lib/xercesImpl.jar:lib/xmlParserAPIs.jar:lib/wsdl4j.jar:lib/saaj.jar:lib/jaxrpc.jar:lib/commons-logging.jar:lib/commons-discovery.jar:lib/axis.jar:lib/log4j-1.2.8.jar:lib/jung-1.5.2.jar:" java net.sf.magicmap.client.gui.MainGUI --- 1,4 ---- #!/bin/sh ! export CLASSPATH="dist/magicmap.jar:lib/activation.jar:lib/axis.jar:lib/colt.jar:lib/forms-1.0.5.jar:lib/looks-1.2.2.jar:lib/mail.jar:lib/magicmapclient.jar:lib/RelativeLayout.jar:lib/xml-apis.jar:lib/commons-collections-3.1.jar:lib/concurrent.jar:lib/looks-1.2.2.jar:lib/xercesImpl.jar:lib/xmlParserAPIs.jar:lib/wsdl4j.jar:lib/saaj.jar:lib/jaxrpc.jar:lib/commons-logging.jar:lib/commons-discovery.jar:lib/axis.jar:lib/log4j-1.2.8.jar:lib/jung-1.5.2.jar:lib\ostermillerutils_1_05_00.jar" java net.sf.magicmap.client.gui.MainGUI |
|
From: Florian L. <fle...@us...> - 2005-09-28 10:33:23
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30462/src/net/sf/magicmap/client/gui/dialogs Modified Files: AboutDialog.java Log Message: homepagelink ist nun klickable Index: AboutDialog.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/AboutDialog.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AboutDialog.java 27 Sep 2005 15:52:30 -0000 1.1 --- AboutDialog.java 28 Sep 2005 10:33:07 -0000 1.2 *************** *** 8,32 **** import javax.swing.ImageIcon; import javax.swing.JButton; - import javax.swing.JCheckBox; - import javax.swing.JComboBox; import javax.swing.JDialog; import javax.swing.JEditorPane; import javax.swing.JLabel; - import javax.swing.JOptionPane; import javax.swing.JPanel; - import javax.swing.JPasswordField; - import javax.swing.JTextArea; import javax.swing.JTextField; - import com.brunchboy.util.swing.relativelayout.RelativeLayout; - - import net.sf.magicmap.client.gui.utils.GUIConstants; import net.sf.magicmap.client.gui.utils.GUIUtils; import net.sf.magicmap.client.gui.utils.RelativePanelBuilder; - import net.sf.magicmap.client.meta.ServerConnectionInfo; - import net.sf.magicmap.client.utils.Settings; - import net.sf.magicmap.client.utils.Version; ! public class AboutDialog extends JDialog implements ActionListener { private JPanel mainPanel; --- 8,26 ---- import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JEditorPane; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; + import javax.swing.event.HyperlinkEvent; + import javax.swing.event.HyperlinkListener; import net.sf.magicmap.client.gui.utils.GUIUtils; import net.sf.magicmap.client.gui.utils.RelativePanelBuilder; ! import com.Ostermiller.util.Browser; ! import com.brunchboy.util.swing.relativelayout.RelativeLayout; ! ! public class AboutDialog extends JDialog implements ActionListener, HyperlinkListener { private JPanel mainPanel; *************** *** 36,44 **** AboutDialog d = new AboutDialog(owner); GUIUtils.locateOnScreen(d); d.setModal(true); d.setVisible(true); } ! public AboutDialog(Frame owner) { super(owner, GUIUtils.filterMnemonic(GUIUtils.i18n("about"))); setSize(406, 430); --- 30,39 ---- AboutDialog d = new AboutDialog(owner); GUIUtils.locateOnScreen(d); + Browser.init(); d.setModal(true); d.setVisible(true); } ! private AboutDialog(Frame owner) { super(owner, GUIUtils.filterMnemonic(GUIUtils.i18n("about"))); setSize(406, 430); *************** *** 62,65 **** --- 57,61 ---- aboutText.setEditable(false); aboutText.setOpaque(false); + aboutText.addHyperlinkListener(this); builder.add(aboutText,"abouttext"); builder.setTop("abouttext",0); *************** *** 68,71 **** --- 64,68 ---- builder.setWidth("abouttext",400); } catch (IOException e) { + //TODO e.printStackTrace(); } *************** *** 89,91 **** --- 86,99 ---- } } + + public void hyperlinkUpdate(HyperlinkEvent e) { + if (HyperlinkEvent.EventType.ACTIVATED.equals(e.getEventType())){ + try { + Browser.displayURL(e.getURL().toExternalForm()); + } catch (IOException e1) { + //TODO + e1.printStackTrace(); + } + } + } } \ No newline at end of file |
|
From: Florian L. <fle...@us...> - 2005-09-28 10:33:23
|
Update of /cvsroot/magicmap/magicmapclient/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30462/res Modified Files: MagicMapLogo.gif aboutText.html Log Message: homepagelink ist nun klickable Index: MagicMapLogo.gif =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/MagicMapLogo.gif,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvszy0M4k and /tmp/cvscACzyw differ Index: aboutText.html =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/res/aboutText.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** aboutText.html 27 Sep 2005 15:52:30 -0000 1.1 --- aboutText.html 28 Sep 2005 10:33:07 -0000 1.2 *************** *** 16,21 **** Florian Lederer <br> Martin Schweigert <br> ! Andreas Weiss <br> Peter Ibach <br> ! Vladimir Stantchevt </html> \ No newline at end of file --- 16,21 ---- Florian Lederer <br> Martin Schweigert <br> ! Andreas Weiß <br> Peter Ibach <br> ! Vladimir Stantchev </html> \ No newline at end of file |
|
From: Florian L. <fle...@us...> - 2005-09-27 15:52:40
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5972/src/net/sf/magicmap/client/gui Modified Files: MainGUI.java Log Message: komplett überarbeiteter AboutDialog Index: MainGUI.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MainGUI.java 23 Sep 2005 15:56:00 -0000 1.6 --- MainGUI.java 27 Sep 2005 15:52:30 -0000 1.7 *************** *** 26,29 **** --- 26,30 ---- import net.sf.magicmap.client.controller.Controller; + import net.sf.magicmap.client.gui.dialogs.AboutDialog; import net.sf.magicmap.client.gui.dialogs.ConnectServerDialog; import net.sf.magicmap.client.gui.dialogs.LoadMapDialog; *************** *** 226,247 **** public void actionPerformed(ActionEvent e){ ! JOptionPane ! .showMessageDialog( ! MainGUI.this, ! "MagicMap" ! + "\n" ! + "\nVersion: " + Version.getVersion() ! + "\nHomepage: http://www.informatik.hu-berlin.de/rok/MagicMap" ! + "\n" ! + "\nHumboldt-Universität zu Berlin" ! + "\nInstitut für Informatik" ! + "\n" ! + "\nTobias Huebner" ! + "\nFlorian Lederer" ! + "\nMartin Schweigert" ! + "\nAndreas Weiss" ! + "\nPeter Ibach" ! + "\nVladimir Stantchevt", ! GUIUtils.i18n("about", false), JOptionPane.PLAIN_MESSAGE); } }; --- 227,231 ---- public void actionPerformed(ActionEvent e){ ! AboutDialog.showDialog(MainGUI.this); } }; |
|
From: Florian L. <fle...@us...> - 2005-09-27 15:52:40
|
Update of /cvsroot/magicmap/magicmapclient/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5972/dist Added Files: magicmap.jar Log Message: komplett überarbeiteter AboutDialog --- NEW FILE: magicmap.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Florian L. <fle...@us...> - 2005-09-27 15:52:39
|
Update of /cvsroot/magicmap/magicmapclient/res In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5972/res Added Files: aboutText.html Log Message: komplett überarbeiteter AboutDialog --- NEW FILE: aboutText.html --- <html> <h1>MagicMap</h1> <br> <br> <br> <br> <br> Version: 0.7 <br> Homepage: <a href="http://www.informatik.hu-berlin.de/rok/MagicMap">http://www.informatik.hu-berlin.de/rok/MagicMap</a> <br> <br> Humboldt-Universität zu Berlin <br> Institut für Informatik <br> <br> Tobias Huebner <br> Florian Lederer <br> Martin Schweigert <br> Andreas Weiss <br> Peter Ibach <br> Vladimir Stantchevt </html> |
|
From: Florian L. <fle...@us...> - 2005-09-27 15:52:38
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5972/src/net/sf/magicmap/client/gui/dialogs Added Files: AboutDialog.java Log Message: komplett überarbeiteter AboutDialog --- NEW FILE: AboutDialog.java --- package net.sf.magicmap.client.gui.dialogs; import java.awt.Frame; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.IOException; import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JDialog; import javax.swing.JEditorPane; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JPasswordField; import javax.swing.JTextArea; import javax.swing.JTextField; import com.brunchboy.util.swing.relativelayout.RelativeLayout; import net.sf.magicmap.client.gui.utils.GUIConstants; import net.sf.magicmap.client.gui.utils.GUIUtils; import net.sf.magicmap.client.gui.utils.RelativePanelBuilder; import net.sf.magicmap.client.meta.ServerConnectionInfo; import net.sf.magicmap.client.utils.Settings; import net.sf.magicmap.client.utils.Version; public class AboutDialog extends JDialog implements ActionListener { private JPanel mainPanel; private JTextField text; public static void showDialog(Frame owner){ AboutDialog d = new AboutDialog(owner); GUIUtils.locateOnScreen(d); d.setModal(true); d.setVisible(true); } public AboutDialog(Frame owner) { super(owner, GUIUtils.filterMnemonic(GUIUtils.i18n("about"))); setSize(406, 430); this.setResizable(false); RelativeLayout layout = new RelativeLayout(); RelativePanelBuilder builder = new RelativePanelBuilder(layout); // OK JButton ok = builder.addButton(GUIUtils.i18n("ok"), "okbutton", "OK", this); builder.setTop("okbutton",this.getHeight()-60); builder.setLeft("okbutton",this.getWidth()-83); builder.setHeight("okbutton",27 - (this.getHeight()-60)); builder.setWidth("okbutton",75 - (this.getWidth()-83)); JEditorPane aboutText = null; try { aboutText = new JEditorPane(this.getClass().getClassLoader().getResource("aboutText.html")); aboutText.setEditable(false); aboutText.setOpaque(false); builder.add(aboutText,"abouttext"); builder.setTop("abouttext",0); builder.setLeft("abouttext",0); builder.setHeight("abouttext",430); builder.setWidth("abouttext",400); } catch (IOException e) { e.printStackTrace(); } JLabel magicMapImage = builder.addLabel("","magicmapimage",58,0); builder.setWidth("magicmapimage",284); builder.setHeight("magicmapimage",222); magicMapImage.setIcon(new ImageIcon(this.getClass().getClassLoader().getResource("MagicMapLogo.gif"))); mainPanel = builder.getPanel(); setContentPane(mainPanel); getRootPane().setDefaultButton(ok); } /** */ public void actionPerformed(ActionEvent e){ if ("OK".equals(e.getActionCommand())){ this.setVisible(false); } } } |
|
From: Florian L. <fle...@us...> - 2005-09-27 15:52:38
|
Update of /cvsroot/magicmap/magicmapclient In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5972 Modified Files: .project build.xml Log Message: komplett überarbeiteter AboutDialog Index: .project =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/.project,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** .project 11 May 2005 10:53:35 -0000 1.3 --- .project 27 Sep 2005 15:52:30 -0000 1.4 *************** *** 14,18 **** --- 14,20 ---- </buildSpec> <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature> </natures> </projectDescription> Index: build.xml =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** build.xml 11 May 2005 15:45:03 -0000 1.5 --- build.xml 27 Sep 2005 15:52:30 -0000 1.6 *************** *** 45,49 **** <target name="clean"> <delete dir="${build}" /> ! <delete dir="${dist}" /> <delete dir="${src.gen}" /> </target> --- 45,49 ---- <target name="clean"> <delete dir="${build}" /> ! <delete dir="${dist}/magicmap.jar" /> <delete dir="${src.gen}" /> </target> |
|
From: Florian L. <fle...@us...> - 2005-09-23 15:56:11
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15283/src/net/sf/magicmap/client/gui Modified Files: MainGUI.java Log Message: About information updated Index: MainGUI.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** MainGUI.java 11 May 2005 10:51:31 -0000 1.5 --- MainGUI.java 23 Sep 2005 15:56:00 -0000 1.6 *************** *** 10,13 **** --- 10,14 ---- import java.io.PrintWriter; import java.io.StringWriter; + import java.net.URL; import java.rmi.RemoteException; import java.util.Locale; *************** *** 228,234 **** .showMessageDialog( MainGUI.this, ! "MagicMap - Version " ! + Version.getVersion() ! + "\n\nHumboldt-Universität zu Berlin\nInstitut für Informatik, Peter Ibach, Tobias Hübner, Martin Schweigert", GUIUtils.i18n("about", false), JOptionPane.PLAIN_MESSAGE); } --- 229,246 ---- .showMessageDialog( MainGUI.this, ! "MagicMap" ! + "\n" ! + "\nVersion: " + Version.getVersion() ! + "\nHomepage: http://www.informatik.hu-berlin.de/rok/MagicMap" ! + "\n" ! + "\nHumboldt-Universität zu Berlin" ! + "\nInstitut für Informatik" ! + "\n" ! + "\nTobias Huebner" ! + "\nFlorian Lederer" ! + "\nMartin Schweigert" ! + "\nAndreas Weiss" ! + "\nPeter Ibach" ! + "\nVladimir Stantchevt", GUIUtils.i18n("about", false), JOptionPane.PLAIN_MESSAGE); } |
|
From: Florian L. <fle...@us...> - 2005-09-23 15:56:11
|
Update of /cvsroot/magicmap/magicmapclient/webstart In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15283/webstart Modified Files: magicmap.jnlp Log Message: About information updated Index: magicmap.jnlp =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/webstart/magicmap.jnlp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** magicmap.jnlp 11 May 2005 10:53:54 -0000 1.2 --- magicmap.jnlp 23 Sep 2005 15:56:00 -0000 1.3 *************** *** 1,10 **** <?xml version="1.0" encoding="UTF-8"?> <jnlp spec="1.0+" ! codebase="http://www.informatik.hu-berlin.de/rok/MagicMap/webstart" href="magicmap.jnlp" > <information> <title>Magic Map</title> ! <vendor>Tobias Huebner, Martin Schweigert, Peter Ibach</vendor> <homepage href="http://www.informatik.hu-berlin.de/rok/MagicMap" /> <description>WLAN Position Determination</description> --- 1,10 ---- <?xml version="1.0" encoding="UTF-8"?> <jnlp spec="1.0+" ! codebase="http://phl.informatik.hu-berlin.de/magicmap/webstart" href="magicmap.jnlp" > <information> <title>Magic Map</title> ! <vendor>Tobias Huebner, Florian Lederer, Martin Schweigert, Andreas Weiss, Peter Ibach, Vladimir Stantchev</vendor> <homepage href="http://www.informatik.hu-berlin.de/rok/MagicMap" /> <description>WLAN Position Determination</description> *************** *** 16,24 **** <resources> <j2se href="http://java.sun.com/products/autodl/j2se" version="1.5+" /> ! <jar href="magicmap_20050213_0_3.jar" main="true"/> ! <jar href="jars/magicmap-server.jar"/> <jar href="jars/derby.jar"/> <jar href="jars/log4j-1.2.8.jar"/> ! <jar href="jars/jpox-20041204.032009.jar"/> <jar href="jars/activation.jar"/> <jar href="jars/axis.jar"/> --- 16,24 ---- <resources> <j2se href="http://java.sun.com/products/autodl/j2se" version="1.5+" /> ! <jar href="magicmap_20050610_0_7.jar" main="true"/> ! <jar href="magicmap-server_20050511_0_6.jar"/> <jar href="jars/derby.jar"/> <jar href="jars/log4j-1.2.8.jar"/> ! <jar href="jars/jpox-20041204.032009.jar"/> <jar href="jars/activation.jar"/> <jar href="jars/axis.jar"/> *************** *** 43,45 **** </resources> <application-desc main-class="net.sf.magicmap.client.gui.MainGUI"/> ! </jnlp> \ No newline at end of file --- 43,45 ---- </resources> <application-desc main-class="net.sf.magicmap.client.gui.MainGUI"/> ! </jnlp> |
|
From: Florian L. <fle...@us...> - 2005-09-23 15:56:09
|
Update of /cvsroot/magicmap/magicmapclient/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15283/dist Added Files: .cvsignore Log Message: About information updated --- NEW FILE: .cvsignore --- magicmap.jar |
|
From: Florian L. <fle...@us...> - 2005-09-23 14:31:18
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31498/src/net/sf/magicmap/server/interfaces Modified Files: PositionFacadeInterface.java Log Message: CE Client fixating Problem solved Index: PositionFacadeInterface.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/interfaces/PositionFacadeInterface.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PositionFacadeInterface.java 12 Feb 2005 15:19:27 -0000 1.1 --- PositionFacadeInterface.java 23 Sep 2005 14:31:04 -0000 1.2 *************** *** 107,109 **** --- 107,123 ---- throws MapException, SessionException, RemoteException; + + /** + * Liefert aktuelle Position des Clients mit der angegebenen MacAdresse + * + * @param sessionId gültige SessionId + * @param mapName Name der Map + * @param clientMac MacAdresse des Clienten dessen Position erfragt wird + * @return Position des Clients auf der Karte + * @throws MapException Fehlende Karte + * @throws SessionException ungültige Session + */ + public abstract String getPositionForClientOnMap(long sessionId, String mapName, String clientMac) + throws MapException, SessionException, RemoteException; + } \ No newline at end of file |
|
From: Florian L. <fle...@us...> - 2005-09-23 14:31:18
|
Update of /cvsroot/magicmap/magicmapserver/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31498/web/WEB-INF Modified Files: deploy.wsdd Log Message: CE Client fixating Problem solved Index: deploy.wsdd =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/web/WEB-INF/deploy.wsdd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** deploy.wsdd 11 May 2005 15:46:30 -0000 1.2 --- deploy.wsdd 23 Sep 2005 14:31:04 -0000 1.3 *************** *** 11,18 **** <beanMapping qname="myNS:SignalCharacterDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.SignalCharacterDTO"/> <beanMapping qname="myNS:SimpleScanResultDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.SimpleScanResultDTO"/> - <beanMapping qname="myNS:PositionDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.PositionDTO"/> <beanMapping qname="myNS:SignalCharacterDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.SignalCharacterDTO"/> <beanMapping qname="myNS:AccessPointDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.AccessPointDTO"/> <beanMapping qname="myNS:ClientDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.ClientDTO"/> </service> <service name="SessionFacade" provider="java:RPC"> --- 11,18 ---- <beanMapping qname="myNS:SignalCharacterDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.SignalCharacterDTO"/> <beanMapping qname="myNS:SimpleScanResultDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.SimpleScanResultDTO"/> <beanMapping qname="myNS:SignalCharacterDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.SignalCharacterDTO"/> <beanMapping qname="myNS:AccessPointDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.AccessPointDTO"/> <beanMapping qname="myNS:ClientDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.ClientDTO"/> + <beanMapping qname="myNS:PositionDTO" xmlns:myNS="urn:dto.server.magicmap.sf.net" languageSpecificType="java:net.sf.magicmap.server.dto.PositionDTO"/> </service> <service name="SessionFacade" provider="java:RPC"> |
|
From: Florian L. <fle...@us...> - 2005-09-23 14:31:12
|
Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31498/src/net/sf/magicmap/server/facade Modified Files: PositionFacade.java Log Message: CE Client fixating Problem solved Index: PositionFacade.java =================================================================== RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** PositionFacade.java 23 Aug 2005 14:17:07 -0000 1.8 --- PositionFacade.java 23 Sep 2005 14:31:04 -0000 1.9 *************** *** 2,5 **** --- 2,6 ---- package net.sf.magicmap.server.facade; + import java.rmi.RemoteException; import java.sql.Timestamp; import java.util.ArrayList; *************** *** 686,689 **** --- 687,742 ---- return (PositionDTO[]) result.toArray(new PositionDTO[0]); } + + + /* (non-Javadoc) + * @see net.sf.magicmap.server.facade.interfaces.PositionFacadeInterface#getPositionsForClientOnMap(long, java.lang.String, java.lang.String) + */ + public String getPositionForClientOnMap(long sessionId, String mapName, String clientMac) + throws MapException, SessionException, RemoteException { + this.logger.info("getPositionsForClientOnMap() "); + PersistenceManager pm = null; + String positionResult = null; + Transaction tx = null; + try{ + pm = JDOUtil.pmfactory.getPersistenceManager(); + tx = pm.currentTransaction(); + tx.begin(); + checkSession(sessionId, pm); + Map map = checkMap(mapName, pm); + checkClient(clientMac, pm); + Extent e = pm.getExtent(Position.class, true); + String filter = "map == myMap && name == myName"; + Query query = pm.newQuery(e, filter); + query.declareParameters("net.sf.magicmap.db.Map myMap, java.lang.String myName"); + query.declareImports("import net.sf.magicmap.db.Map; import java.lang.String;"); + Collection results = null; + results = (Collection) query.execute(map, clientMac); + if (results != null){ + Iterator it = results.iterator(); + if(it.hasNext()){ + Position pos = (Position) it.next(); + positionResult = String.valueOf(pos.getPosX())+ "#" + String.valueOf(pos.getPosY()) + "#" + String.valueOf(pos.isFixed()); + } + } + tx.commit(); + } catch (Exception e){ + e.printStackTrace(); + if (e instanceof MapException){ + throw (MapException) e; + } + if (e instanceof SessionException){ + throw (SessionException) e; + } + } finally{ + if (tx.isActive()){ + tx.rollback(); + } + JDOUtil.closePM(pm); + } + this.logger.info("getPositionsForClientOnMap() - done "); + return positionResult; + + + } } \ No newline at end of file |
|
From: Andreas W. <an...@us...> - 2005-08-31 12:45:59
|
Update of /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/algorithms In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5716/src/net/sf/magicmap/client/algorithms Modified Files: MagicMetric.java Log Message: Index: MagicMetric.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/algorithms/MagicMetric.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MagicMetric.java 16 Jan 2005 16:01:29 -0000 1.1 --- MagicMetric.java 31 Aug 2005 12:45:47 -0000 1.2 *************** *** 114,118 **** // Jetzt die Verhältnise ausrechnen int n = same.size(); ! int m = (n * (n - 1)) / 2; // Länge der entstehenden Vektoren double[] v1 = new double[m]; double[] v2 = new double[m]; --- 114,118 ---- // Jetzt die Verhältnise ausrechnen int n = same.size(); ! int m = (n * (n - 1)); // Länge der entstehenden Vektoren double[] v1 = new double[m]; double[] v2 = new double[m]; *************** *** 121,127 **** for (int i = 0; i < a.length - 1; i++){ for (int j = i + 1; j < a.length; j++){ ! v1[c] = a[i] / a[j]; ! v2[c] = b[i] / b[j]; ! c++; } } --- 121,130 ---- for (int i = 0; i < a.length - 1; i++){ for (int j = i + 1; j < a.length; j++){ ! v1[c] = a[i] / a[j]; ! v2[c] = b[i] / b[j]; ! c++; ! v1[c] = a[j] / a[i]; ! v2[c] = b[j] / b[i]; ! c++; } } |
|
From: Andreas W. <an...@us...> - 2005-08-31 12:40:26
|
Update of /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1799/src/net/sf/magicmap/client/gui Modified Files: MapPanel.java Log Message: added 2 comments Index: MapPanel.java =================================================================== RCS file: /cvsroot/magicmap//magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MapPanel.java 15 Jul 2005 16:40:04 -0000 1.10 --- MapPanel.java 31 Aug 2005 12:40:15 -0000 1.11 *************** *** 233,239 **** String r = selectedNode.getName(); if (r != null){ ! selectedNode.setUpdate(true); ! Controller.getInstance().createLocation(getLastX(), getLastY(), r, true, this); ! selectedNode.setUpdate(false); } } --- 233,239 ---- String r = selectedNode.getName(); if (r != null){ ! selectedNode.setUpdate(true); // aktuelles Icon wird auf das UpdateIcon gesetzt ! Controller.getInstance().createLocation(getLastX(), getLastY(), r, true, this); // der Referenzpunkt neu eingemessen ! selectedNode.setUpdate(false); // und hier wieder zurückgesetzt } } |
|
From: Tobias H. <thu...@us...> - 2005-08-31 11:59:30
|
Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2890/src/net/sf/magicmap/client/views Modified Files: MapView.java Log Message: + Marked position for metric declaration + Changed MagicMetric field to NodeModelMetric Index: MapView.java =================================================================== RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MapView.java 15 Jul 2005 16:40:05 -0000 1.10 --- MapView.java 31 Aug 2005 11:59:16 -0000 1.11 *************** *** 26,29 **** --- 26,30 ---- import net.sf.magicmap.client.algorithms.MagicMetric; + import net.sf.magicmap.client.algorithms.NodeModelMetric; import net.sf.magicmap.client.controller.Controller; import net.sf.magicmap.client.gui.PACWGraphDraw; *************** *** 90,94 **** private HashMap locationLocationMap; ! private MagicMetric metric; private boolean showEdgesBetweenLocations = true; --- 91,95 ---- private HashMap locationLocationMap; ! private NodeModelMetric metric; private boolean showEdgesBetweenLocations = true; *************** *** 118,121 **** --- 119,125 ---- this.model = null; this.setFrameIcon(GUIBuilder.getToolIcon(GUIConstants.ICON_MAP)); + + // TODO Hier kann eine andere Metrik verwendet werden + this.metric = new MagicMetric(); // Zwischenspeicher für Kanten Client => Location |
|
From: Andreas W. <an...@us...> - 2005-08-30 19:23:43
|
Update of /cvsroot/magicmap//magicmapclient/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1319/dist Removed Files: magicmap.jar Log Message: removed generated magicmap.jar --- magicmap.jar DELETED --- |
1 message has been excluded from this view by a project administrator.
