From a4993bcd399b3c70295110ee5af3d8cec8d20d0e Mon Sep 17 00:00:00 2001
From: hdaniels <unknown>
Date: Thu, 23 Jun 2005 10:52:38 +0000
Subject: [PATCH] added an application icon for gfeditor. But the icon itself
 is worth improvement

---
 .../de/uka/ilkd/key/ocl/gf/GFEditor2.java     |  21 +++++++++++++-----
 src/JavaGUI2/gf-logo-64.gif                   | Bin 0 -> 1513 bytes
 src/Makefile                                  |   2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 src/JavaGUI2/gf-logo-64.gif

diff --git a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java
index 634f2c08b..a43165d5f 100644
--- a/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java
+++ b/src/JavaGUI2/de/uka/ilkd/key/ocl/gf/GFEditor2.java
@@ -466,7 +466,14 @@ KeyListener, FocusListener {
         public GFEditor2(String gfcmd, boolean isHtml, URL baseURL) {
                 this.callback = null;
                 this.commandPath = gfcmd;
-                initializeGUI(baseURL, isHtml);
+                Image icon = null;
+                try {
+                final URL iconURL = ClassLoader.getSystemResource("gf-logo-64.gif");
+                icon = Toolkit.getDefaultToolkit().getImage(iconURL);
+                } catch (NullPointerException npe) {
+                        logger.info("gf-logo-64.gif could not be found.\n" + npe.getLocalizedMessage());
+                }
+                initializeGUI(baseURL, isHtml, icon);
                 initializeGF(gfcmd, null);                
                 //readAndDisplay();
         }
@@ -488,7 +495,7 @@ KeyListener, FocusListener {
                 Utils.tickProgress(pm, 5220, "Loading grammars");
                 initializeGF(gfcmd, pm);
                 Utils.tickProgress(pm, 9350, "Initializing GUI");
-                initializeGUI(null, true);
+                initializeGUI(null, true, null);
                 
                 // send correct term (syntax tree)
                 //The initial GF constraint has until now always been 
@@ -561,16 +568,20 @@ KeyListener, FocusListener {
         /**
          * reliefs the constructor from setting up the GUI stuff
          * @param baseURL the base URL for relative links in the HTML view
-         * @param showHtml TODO
+         * @param showHtml if the linearization area for HTML should be active
+         * instead of the pure text version
+         * @param icon The icon in the title bar of the main window.
+         * For KeY-usage, no icon is given and the Swing default is chosen
+         * instead. 
          */
-        private void initializeGUI(URL baseURL, boolean showHtml) {
+        private void initializeGUI(URL baseURL, boolean showHtml, Image icon) {
                 this.setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
                 this.addWindowListener(new WindowAdapter() {
                         public void windowClosing(WindowEvent e) {
                                 endProgram();
                         }
                 });
-                
+                setIconImage(icon);
                 this.readDialog = new ReadDialog(this);
                 
                 //Add listener to components that can bring up popup menus.
diff --git a/src/JavaGUI2/gf-logo-64.gif b/src/JavaGUI2/gf-logo-64.gif
new file mode 100644
index 0000000000000000000000000000000000000000..041cca41e878163491de53e2b84eedded3895b23
GIT binary patch
literal 1513
zcmZ?wbh9u|bYO5`c;3wLgMr}(8`}>Kjvt(yKe)JlaC86Q;rYSO|3g6FhoIn3Vd0-5
zB0oh%e~O9yl#uu-E&WqY?x&*SPbH<F%E~`gRDP<e{!~~0siE;xTl=T3?oUI*pT@>N
zO-z28n*KC1`(<wa%fjN9rR6Uxt6$dEzwGRO+1vkea{A@${L9t#mz&!!PtRXoUcbD(
zfBE?Q^7Z`{6!a@N_*Z1)ujuICF)_d6;(o`+|IWzxot5=FC+Bx=?(e+3-}(8!OG<uM
zRsF86{#{@Hr?K%*Q`4W;)<2z{e|mfW^!5FjFyYU{iGL<d`ZIa*pQ%&-%$@sZ!Gb@F
z7X4ka<nPj@f0r%$yL|cIl`H?QS@U<@y1(n!|J|_R@1{+EH*fyCWy{~KTmNp~{&(-*
zzx($6-M|0u!GnJf9r}CZ$lv3~|D8Pf@6@S(r%(Sod-mV?^Zzbg`gir}zZ*CH-Msnl
z_U(Un?)<xZ_usvH{~kU1_xSO@Cr|!8efsa&vwtsM{CoB4-|N@^-n{w$_U-?7@BY7k
z|NrC1|DQkq|MKPk_wWCI{rdms&;Nh_{*Quz2mu`i1_lODUSQz($H2}h<FR4E!DbF&
zt(X%54`of<D^|?#XgcB|YSXu1=j9EH-5Z<Ee36*gaDYqNGe|FTl2K=`D2q_fi$u2z
z$7i#C6q#6XfOWFD?0tj6LI)>78w>kqKPM_25w`YZzga1ybg<thQ1sEqhY81KtYJNV
zrr-gy=8eXtO)ft^JbiOeUtTF?Bj>b!K2|S=ovs`nolLSdo7OR2e0b(wYr0iK#N;VF
zOfuDc#&?>T8E4K;6??&<vNKUZmittN&SVGo=lxbf9cdEjj(q2qTeF=y*l_NUtz6NO
zW0kFme0+6f^WQyM(EH(BgNlmfy_+6w_GkD{XD(3vm8hV+<~{2dg|4#g0Sf;d{_}~o
z<$a3$tRc{B_j)?R+s$l=g7&Mpl)g?5%a|mu&hYqe?U(olCMJ&rXVx2Pk%ICjFCH`t
zxM?W1Fneut=JHEf@vu#%>_uXmD?`A;MC&=%Bc+w3c7%6sT-b3yZ0^R2TVfn5Hq2>N
z^P1MeWpzX#xv%}`g2N*Ge<W@*2OltGkhYk2>=;7<PtYL&-!d~7PA0{Nj#DR9Hncbt
z^9ZnYI?NM2#!$>NrI{zCOwGA3eb>gMnUOmc(;Tg~7%WfGoe?%chPmM3H9p}z2`?6Q
zsQqG+;4Cz3kYQI$Y?MoXt8hqQM%t>E%bb@qPLLC;shpsoeup7C#HdO11h4vq(hE`-
zI6WA{Rz-SFWJu<!RAdm1yf{lll&RukfDltiqt;xxP{jkihu_VbvR<C?bdI|RM*^$g
zg|d`ZhDG;|urOPF`53s3`|CnxW}lQ)Hg@?HI|O!eZvDu}o;JtzCWCFjDS<s~FE1Wu
zm>_%XD4U4QM*U4}wvGqcn#!h4<KSYLsOI#C&xl=stHWS=L1RkeAqF*#z;?$c*A}*L
zGB22Lbmf_qiY;txF&~_S!ZsXq<2AXFvsu)0PeCK26vslh+L8pr7A}d76<aPztT12^
P<C4?(dWDIVg~1vCq+z3z

literal 0
HcmV?d00001

diff --git a/src/Makefile b/src/Makefile
index 6e1e6b8b8..d51a921d5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -119,7 +119,7 @@ javac:
 
 jar: javac
 	cd JavaGUI; $(JAR) -cmf manifest.txt gf-java.jar *.class ; cd ..
-	cd $(GFEDITOR) ; rm -rf jarcontents ; mkdir jarcontents ; cp -r de/ ManifestMain.txt ../../LICENSE LICENCE_jargs jarcontents ; cat jargs-1.0.jar | (cd jarcontents; jar -x jargs) ; cd jarcontents ; $(JAR) -cmf ManifestMain.txt ../gfeditor.jar  de/uka/ilkd/key/ocl/gf/*.class jargs LICENSE LICENCE_jargs ; cd .. ; cd ..
+	cd $(GFEDITOR) ; rm -rf jarcontents ; mkdir jarcontents ; cp -r de/ ManifestMain.txt ../../LICENSE LICENCE_jargs gf-logo-64.gif jarcontents ; cat jargs-1.0.jar | (cd jarcontents; jar -x jargs) ; cd jarcontents ; $(JAR) -cmf ManifestMain.txt ../gfeditor.jar  de/uka/ilkd/key/ocl/gf/*.class jargs LICENSE LICENCE_jargs gf-logo-64.gif ; cd .. ; cd ..
 
 showflags:
 	@echo $(GHCFLAGS)