Author: kentam
Date: Wed Oct 13 14:49:14 2004
New Revision: 54752
Modified:
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.java
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.vm
Log:
Fix detection of root package (represented by "", not null)
Modified:
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.java
==============================================================================
---
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.java
(original)
+++
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.java
Wed Oct 13 14:49:14 2004
@@ -58,6 +58,11 @@
public String getPackage() { return _packageName; }
/**
+ * Is the ClientInitializer in the root package?
+ */
+ public boolean isRootPackage() { return getPackage().equals(""); }
+
+ /**
* Returns the unqualified classname of the ClientInitializer
*/
public String getShortName() { return _shortName; }
Modified:
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.vm
==============================================================================
---
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.vm
(original)
+++
incubator/beehive/trunk/controls/src/runtime/org/apache/beehive/controls/runtime/generator/ClientInitializer.vm
Wed Oct 13 14:49:14 2004
@@ -137,7 +137,7 @@
##
## THE CONTROL INITIALIZER CLASS TEMPLATE
##
-#if ($init.package)
+#if (!$init.isRootPackage())
package $init.package;
#end