diff options
| author | Keith Packard <keithp@keithp.com> | 2015-05-26 01:04:00 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-05-26 01:04:00 -0700 |
| commit | f822b84d8c25159ff113fef6a419b6e18e87a87a (patch) | |
| tree | 7521b231f3b31a68a0b6a35e62d3f52fe295abb4 /altosuilib | |
| parent | 4895f443e4a748de2677e51869f20c05d265c944 (diff) | |
altosuilib: Get rid of AltosUIVersion.java
It's been moved to altoslib/AltosVersion.java
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosuilib')
| -rw-r--r-- | altosuilib/.gitignore | 1 | ||||
| -rw-r--r-- | altosuilib/AltosUIConfigure.java | 5 | ||||
| -rw-r--r-- | altosuilib/AltosUIVersion.java.in | 28 | ||||
| -rw-r--r-- | altosuilib/Makefile.am | 1 |
4 files changed, 3 insertions, 32 deletions
diff --git a/altosuilib/.gitignore b/altosuilib/.gitignore index 4ad8a77a..943408ec 100644 --- a/altosuilib/.gitignore +++ b/altosuilib/.gitignore @@ -1,4 +1,3 @@ -AltosUIVersion.java bin classaltosuilib.stamp altosuilib*.jar diff --git a/altosuilib/AltosUIConfigure.java b/altosuilib/AltosUIConfigure.java index 0bd8fb96..75957b33 100644 --- a/altosuilib/AltosUIConfigure.java +++ b/altosuilib/AltosUIConfigure.java @@ -22,6 +22,7 @@ import java.awt.event.*; import java.beans.*; import javax.swing.*; import javax.swing.event.*; +import org.altusmetrum.altoslib_7.*; class DelegatingRenderer implements ListCellRenderer<Object> { @@ -269,8 +270,8 @@ public class AltosUIConfigure row++; pane.add(new JLabel (String.format("AltOS version %s (%smaps key)", - AltosUIVersion.version, - AltosUIVersion.has_google_maps_api_key() ? "" : "no ")), + AltosVersion.version, + AltosVersion.has_google_maps_api_key() ? "" : "no ")), constraints(0, 3)); row++; diff --git a/altosuilib/AltosUIVersion.java.in b/altosuilib/AltosUIVersion.java.in deleted file mode 100644 index f65b41cd..00000000 --- a/altosuilib/AltosUIVersion.java.in +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright © 2011 Keith Packard <keithp@keithp.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -package org.altusmetrum.altosuilib_7; - -public class AltosUIVersion { - public final static String version = "@VERSION@"; - - public final static String google_maps_api_key = @GOOGLEKEY@; - - static boolean has_google_maps_api_key() { - return google_maps_api_key != null && google_maps_api_key.length() > 1; - } -} diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am index 71f1c2de..a00e4a12 100644 --- a/altosuilib/Makefile.am +++ b/altosuilib/Makefile.am @@ -29,7 +29,6 @@ altosuilib_JAVA = \ AltosUIPreferencesBackend.java \ AltosUIPreferences.java \ AltosUISeries.java \ - AltosUIVersion.java \ AltosUSBDevice.java \ AltosVoice.java \ AltosDisplayThread.java \ |