From e514d5b8bb291c034c13312ded38149649636327 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Tue, 25 Oct 2005 10:20:03 +0000 Subject: [PATCH] INTEGRATION: CWS morejava (1.4.88); FILE MERGED 2005/08/26 13:59:08 fridrich_strba 1.4.88.1: Issue number: Submitted by: kendy Reviewed by: fridrich_strba Allow compiling with jdk1.5.0 ("enum" is reserved word in java 5) --- .../modules/office/wizard/SelectPathVisualPanel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java b/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java index 1fa09d5e3169..b39cd4452d4c 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/wizard/SelectPathVisualPanel.java @@ -36,10 +36,10 @@ public class SelectPathVisualPanel extends javax.swing.JPanel { OfficeInstallation orig = panel.getSelectedPath(); try { - Enumeration enum = SVersionRCFile.createInstance().getVersions(); + Enumeration enumer = SVersionRCFile.createInstance().getVersions(); - while (enum.hasMoreElements()) { - OfficeInstallation oi = (OfficeInstallation)enum.nextElement(); + while (enumer.hasMoreElements()) { + OfficeInstallation oi = (OfficeInstallation)enumer.nextElement(); installationsComboBox.addItem(oi); } }