Author: hqm
Date: 2007-09-28 17:17:41 -0700 (Fri, 28 Sep 2007)
New Revision: 6687
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ResourceCompiler.java
Log:
Change 20070928-hqm-4 by [EMAIL PROTECTED] on 2007-09-28 20:15:33 EDT
in /cygdrive/c/users/hqm/openlaszlo/trunk2
for http://svn.openlaszlo.org/openlaszlo/trunk
Summary: disable compiler warning for duplicate resource name
New Features:
Bugs Fixed: LPP-4615
Technical Reviewer: ptw
QA Reviewer: pkang
Doc Reviewer:
Documentation:
Release Notes:
Details:
remove the warning for duplicated resource, for now.
There are a couple of proposals for adding a flag to resource
declaration which permits overrides explicitly.
This patch is just a temporary solution for now.
Tests:
test/compiler_errors/duplicate-resource.lzx
Modified:
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ResourceCompiler.java
===================================================================
---
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ResourceCompiler.java
2007-09-28 23:20:15 UTC (rev 6686)
+++
openlaszlo/trunk/WEB-INF/lps/server/src/org/openlaszlo/compiler/ResourceCompiler.java
2007-09-29 00:17:41 UTC (rev 6687)
@@ -114,15 +114,17 @@
, element);
Set resourceNames = mEnv.getResourceNames();
- if (resourceNames.contains(name)) {
+ if (false) {
+ if (resourceNames.contains(name)) {
mEnv.warn(
-/* (non-Javadoc)
- * @i18n.test
- * @org-mes="The resource name '" + p[0] + "' has already been defined"
- */
- org.openlaszlo.i18n.LaszloMessages.getMessage(
- ResourceCompiler.class.getName(),"051018-124", new Object[]
{name})
-, element);
+ /* (non-Javadoc)
+ * @i18n.test
+ * @org-mes="The resource name '" + p[0] + "' has
already been defined"
+ */
+ org.openlaszlo.i18n.LaszloMessages.getMessage(
+ ResourceCompiler.class.getName(),"051018-124", new
Object[] {name})
+ , element);
+ }
}
resourceNames.add(name);
_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
