public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
From: cagney@sourceware.org
To: frysk-cvs@sourceware.org
Subject: [SCM]  master: Delete Config.getHelpDir().
Date: Thu, 17 Apr 2008 15:20:00 -0000	[thread overview]
Message-ID: <20080417152040.13614.qmail@sourceware.org> (raw)

The branch, master has been updated
       via  bd9b8d033cf35170501a367ee9c770d3b3f6374f (commit)
      from  bafe331e7bc63d1e3ea34f1282602a9ff51ba1d3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit bd9b8d033cf35170501a367ee9c770d3b3f6374f
Author: Andrew Cagney <cagney@redhat.com>
Date:   Thu Apr 17 11:19:23 2008 -0400

    Delete Config.getHelpDir().
    
    frysk-gui/frysk/gui/ChangeLog
    2008-04-17  Andrew Cagney  <cagney@redhat.com>
    
    	* FryskHelpManager.java: Use frysk.config.Prefix.
    
    frysk-sys/frysk/config/ChangeLog
    2008-04-17  Andrew Cagney  <cagney@redhat.com>
    
    	* Prefix.java (helpFile(String)): Rename helpDir.
    	* TestPrefix.java: Update.
    
    	* Config.java (getHelpDir()): Delete.

-----------------------------------------------------------------------

Summary of changes:
 frysk-gui/frysk/gui/ChangeLog             |    2 +
 frysk-gui/frysk/gui/FryskHelpManager.java |   34 ++++++++++++-----------------
 frysk-sys/frysk/config/ChangeLog          |    5 ++++
 frysk-sys/frysk/config/Config.java        |    7 ------
 frysk-sys/frysk/config/Prefix.java        |    4 +-
 frysk-sys/frysk/config/TestPrefix.java    |    2 +-
 6 files changed, 24 insertions(+), 30 deletions(-)

First 500 lines of diff:
diff --git a/frysk-gui/frysk/gui/ChangeLog b/frysk-gui/frysk/gui/ChangeLog
index ca48359..f93a9dc 100644
--- a/frysk-gui/frysk/gui/ChangeLog
+++ b/frysk-gui/frysk/gui/ChangeLog
@@ -1,5 +1,7 @@
 2008-04-17  Andrew Cagney  <cagney@redhat.com>
 
+	* FryskHelpManager.java: Use frysk.config.Prefix.
+
 	* disassembler/DisassemblyWindowFactory.java: Use
 	frysk.config.Prefix.
 
diff --git a/frysk-gui/frysk/gui/FryskHelpManager.java b/frysk-gui/frysk/gui/FryskHelpManager.java
index 0ec3477..9fc4a29 100644
--- a/frysk-gui/frysk/gui/FryskHelpManager.java
+++ b/frysk-gui/frysk/gui/FryskHelpManager.java
@@ -39,29 +39,23 @@
 
 package frysk.gui;
 
-import frysk.config.Config;
+import frysk.config.Prefix;
 import frysk.sys.Fork;
 
-public class FryskHelpManager
-{
+public class FryskHelpManager {
 
-  private static final String HELP_PROGRAM = "/usr/bin/gnome-help";
+    private static final String HELP_PROGRAM = "/usr/bin/gnome-help";
   
-  private static final String HELP_DOC = "frysk_doc.xml";
+    private static final String HELP_DOC = "frysk_doc.xml";
   
-  public static String helpPath;
-
-  /**
-   * activateHelp activates the Gnome help system pointing it at Frysk's
-   * installed help.
-   */
-  public static void activateHelp ()
-  {
-    
-      Fork.daemon(new String[]
-	  {
-	      HELP_PROGRAM,
-	      Config.getHelpDir () + HELP_DOC
-	  });
-  }
+    /**
+     * activateHelp activates the Gnome help system pointing it at
+     * Frysk's installed help.
+     */
+    public static void activateHelp() {
+	Fork.daemon(new String[] {
+		HELP_PROGRAM,
+		Prefix.helpFile(HELP_DOC).getAbsolutePath()
+	    });
+    }
 }
diff --git a/frysk-sys/frysk/config/ChangeLog b/frysk-sys/frysk/config/ChangeLog
index 4046b7f..18d9236 100644
--- a/frysk-sys/frysk/config/ChangeLog
+++ b/frysk-sys/frysk/config/ChangeLog
@@ -1,5 +1,10 @@
 2008-04-17  Andrew Cagney  <cagney@redhat.com>
 
+	* Prefix.java (helpFile(String)): Rename helpDir.
+	* TestPrefix.java: Update.
+
+	* Config.java (getHelpDir()): Delete.
+	
 	* Config.java (getPkgLib64File(String)): Delete.
 	(getPkgLib32File(String)): Delete.
 	(getImagesDir()): Delete.
diff --git a/frysk-sys/frysk/config/Config.java b/frysk-sys/frysk/config/Config.java
index 47046ba..3e97153 100644
--- a/frysk-sys/frysk/config/Config.java
+++ b/frysk-sys/frysk/config/Config.java
@@ -57,13 +57,6 @@ public class Config {
     }
 
     /**
-     * Directory containing the frysk help files.
-     */
-    public static final File getHelpDir () {
-	return Prefix.helpDir();
-    }
-
-    /**
      * A file in frysk's shared, and 32-bit and 64-bit independant,
      * data directory.  Typically <tt>/usr/share/frysk/FILE</tt>
      */
diff --git a/frysk-sys/frysk/config/Prefix.java b/frysk-sys/frysk/config/Prefix.java
index dc7b03b..207d628 100644
--- a/frysk-sys/frysk/config/Prefix.java
+++ b/frysk-sys/frysk/config/Prefix.java
@@ -96,8 +96,8 @@ public class Prefix {
     /**
      * Directory containing the frysk help files.
      */
-    public static final File helpDir() {
-	return current.helpDir;
+    public static final File helpFile(String file) {
+	return getFile(current.helpDir, file);
     }
     private final File helpDir;
 
diff --git a/frysk-sys/frysk/config/TestPrefix.java b/frysk-sys/frysk/config/TestPrefix.java
index fa7f5d6..e040550 100644
--- a/frysk-sys/frysk/config/TestPrefix.java
+++ b/frysk-sys/frysk/config/TestPrefix.java
@@ -66,7 +66,7 @@ public class TestPrefix extends TestCase {
     private void validate(int pure) {
 	// The expected paths are valid.
 	assertNotNull("getGladeDir", Prefix.gladeDir());
-	assertNotNull("getHelpDir", Prefix.helpDir());
+	assertNotNull("getHelpDir", Prefix.helpFile(null));
 	assertNotNull("getImagesDir", Prefix.imagesDir());
 	assertNotNull("getBinFile", Prefix.binFile(null));
 	assertNotNull("getPkgDataFile", Prefix.pkgDataFile(null));


hooks/post-receive
--
frysk system monitor/debugger


                 reply	other threads:[~2008-04-17 15:20 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080417152040.13614.qmail@sourceware.org \
    --to=cagney@sourceware.org \
    --cc=frysk-cvs@sourceware.org \
    --cc=frysk@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).