Author: cmarcum
Date: Sat May 2 15:08:21 2015
New Revision: 1677320
URL: http://svn.apache.org/r1677320
Log:
#i126246#
added sdkOk property and getter/setter in AddOnWizardIterator to keep track of
valid office and sdk locations.
added getter for AddOnWizardIterator in AddOnWizardPanel1Project to be used by
AddOnPanelVisual1Project valid method.
added check of sdkOk in AddOnPanelVisual1Project valid method to disable next
button and display message.
added message to bundle to display instructions to cancel dialog if settings
were skipped and where to find settings in tools > options.
added same message in it_IT bundle.
Modified:
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual1Project.java
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnWizardIterator.java
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnWizardPanel1Project.java
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/Bundle.properties
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/Bundle_it_IT.properties
Modified:
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual1Project.java
URL:
http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual1Project.java?rev=1677320&r1=1677319&r2=1677320&view=diff
==============================================================================
---
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual1Project.java
(original)
+++
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual1Project.java
Sat May 2 15:08:21 2015
@@ -300,6 +300,12 @@ public class AddOnPanelVisual1Project ex
boolean valid(WizardDescriptor wizardDescriptor) {
+ if (!panel.getAddOnWizardIterator().isSdkOk()) {
+ String message = NbBundle.getMessage(AddOnWizardIterator.class,
"LBL_ErrorMessageOfficeSdk");
+ wizardDescriptor.putProperty("WizardPanel_errorMessage", message);
// NOI18N
+ return false; // Office or SDK skipped during Configuration Panel
+ }
+
if (projectNameTextField.getText().length() == 0) {
String message = NbBundle.getMessage(AddOnWizardIterator.class,
"LBL_ErrorMessageFolder");
wizardDescriptor.putProperty("WizardPanel_errorMessage", message);
// NOI18N
Modified:
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnWizardIterator.java
URL:
http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnWizardIterator.java?rev=1677320&r1=1677319&r2=1677320&view=diff
==============================================================================
---
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnWizardIterator.java
(original)
+++
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnWizardIterator.java
Sat May 2 15:08:21 2015
@@ -58,6 +58,10 @@ public class AddOnWizardIterator impleme
private WizardDescriptor wiz;
private HashSet<ChangeListener>listeners;
+ // to track status of valid office and sdk through ConfigurationValidator
+ // to disable next button in AddOnWizardPanel1Project if setting was
skipped
+ private boolean sdkOk = false;
+
public AddOnWizardIterator() {
listeners = new HashSet<ChangeListener>();
}
@@ -154,7 +158,13 @@ public class AddOnWizardIterator impleme
}
public void initialize(WizardDescriptor wiz) {
- ConfigurationValidator.validateSettings();
+ // ConfigurationValidator.validateSettings();
+ if (ConfigurationValidator.validateSettings()) {
+ setSdkOk(true);
+ } else {
+ setSdkOk(false);
+ }
+ // continue so user may cancel
this.wiz = wiz;
index = 0;
createPanelCache();
@@ -233,4 +243,12 @@ public class AddOnWizardIterator impleme
}
}
+ public boolean isSdkOk() {
+ return this.sdkOk;
+ }
+
+ public void setSdkOk(boolean sdkOk) {
+ this.sdkOk = sdkOk;
+ }
+
}
Modified:
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnWizardPanel1Project.java
URL:
http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnWizardPanel1Project.java?rev=1677320&r1=1677319&r2=1677320&view=diff
==============================================================================
---
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnWizardPanel1Project.java
(original)
+++
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnWizardPanel1Project.java
Sat May 2 15:08:21 2015
@@ -108,4 +108,8 @@ public class AddOnWizardPanel1Project im
component.validate(wizardDescriptor);
}
+ public AddOnWizardIterator getAddOnWizardIterator() {
+ return addonIt;
+ }
+
}
Modified:
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/Bundle.properties
URL:
http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/Bundle.properties?rev=1677320&r1=1677319&r2=1677320&view=diff
==============================================================================
---
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/Bundle.properties
(original)
+++
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/Bundle.properties
Sat May 2 15:08:21 2015
@@ -14,6 +14,7 @@ LBL_ErrorMessageFolder="Project Name is
LBL_ErrorMessagePath=Project Folder is not a valid path.
LBL_ErrorMessageCreateFolder=Project Folder cannot be created.
LBL_ErrorMessageFolderNotEmpty=Project Folder already exists and is not empty.
+LBL_ErrorMessageOfficeSdk=Cancel and set OpenOffice and SDK locations in
<br/>Tools > Options > Miscellaneous > AOO API Plugin
# AddOnPanelVisual1Project
LBL_ProjectName=Project &Name:
Modified:
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/Bundle_it_IT.properties
URL:
http://svn.apache.org/viewvc/openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/Bundle_it_IT.properties?rev=1677320&r1=1677319&r2=1677320&view=diff
==============================================================================
---
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/Bundle_it_IT.properties
(original)
+++
openoffice/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/Bundle_it_IT.properties
Sat May 2 15:08:21 2015
@@ -19,16 +19,18 @@ LBL_UIProject=Creazione della struttura
#LBL_ErrorMessagePath=Project Folder is not a valid path.
#LBL_ErrorMessageCreateFolder=Project Folder cannot be created.
#LBL_ErrorMessageFolderNotEmpty=Project Folder already exists and is not empty.
+#LBL_ErrorMessageOfficeSdk=Cancel and set OpenOffice and SDK locations in
<br/>Tools > Options > Miscellaneous > AOO API Plugin
LBL_UIProject_Menu=Crea la struttura del Menu
LBL_UIProject_Toolbar=Crea la struttura della Barra degli strumenti
LBL_UIDesign=Definizione dell'interfaccia utente
LBL_AddOnEditor=Definizione di Funzioni e Descrizione con relativa
localizzazione
LBL_UIEditor=Definizione dell'interfaccia utente: Menu e Barre degli Strumenti
LBL_FileChooserTitle=Seleziona percorso del progetto
-LBL_ErrorMessageFolder="Il nome del progetto non \u00E8 un nome di cartella
valido."
-LBL_ErrorMessagePath=La cartella di progetto non \u00E8 un percorso valido.
-LBL_ErrorMessageCreateFolder=La cartella di progetto non pu\u00F2 essere
creata.
-LBL_ErrorMessageFolderNotEmpty=La cartella di progetto \u00E8 gi\u00E0
esistente e non \u00E8 vuota.
+LBL_ErrorMessageFolder="Il nome del progetto non \u00e8 un nome di cartella
valido."
+LBL_ErrorMessagePath=La cartella di progetto non \u00e8 un percorso valido.
+LBL_ErrorMessageCreateFolder=La cartella di progetto non pu\u00f2 essere
creata.
+LBL_ErrorMessageFolderNotEmpty=La cartella di progetto \u00e8 gi\u00e0
esistente e non \u00e8 vuota.
+LBL_ErrorMessageOfficeSdk=Annullare e impostare i percorsi di OpenOffice e del
suo SDK in <br/>Tools > Options > Miscellaneous > AOO API Plugin
# AddOnPanelVisual1Project
#LBL_ProjectName=Project &Name:
@@ -84,8 +86,8 @@ LBL_ComboBoxContext=Contesto:
#BUTTON_MoveDown_Tooltip=Move the selected entry down in the structure
BUTTON_AddFunction_Tooltip=Aggiunge un nuovo comando
BUTTON_Delete_Tooltip=Cancella l'elemento selezionato
-BUTTON_AddLang_Tooltip=Aggiunge una nuova lingua a tutte le propriet\u00E0
localizzate
-BUTTON_DeleteLang_Tooltip=Cancella la lingua selezionata da tutte le
propriet\u00E0 localizzate
+BUTTON_AddLang_Tooltip=Aggiunge una nuova lingua a tutte le propriet\u00e0
localizzate
+BUTTON_DeleteLang_Tooltip=Cancella la lingua selezionata da tutte le
propriet\u00e0 localizzate
BUTTON_AddSubMenu_Tooltip=Aggiunge una nuova voce di menu
BUTTON_AddSeparator_Tooltip=Aggiunge un nuovo separatore nella struttura del
menu
BUTTON_MoveUp_Tooltip=Sposta la voce selezionata in alto nella struttura
@@ -101,9 +103,9 @@ BUTTON_MoveDown_Tooltip=Sposta la voce s
TF_ProjectName_Tooltip=Nome del nuovo progetto creato (utilizzato anche come
nome della cartella di progetto)
TF_MainClassName_Tooltip=Nome della classe di implementazione principale
TF_PackageName_Tooltip=Nome del package Java
-TF_ProjectLocation_Tooltip=Percorso della directory in cui il progetto
verr\u00E0 creato
+TF_ProjectLocation_Tooltip=Percorso della directory in cui il progetto
verr\u00e0 creato
TF_ProjectFolder_Tooltip=Cartella di destinazione finale del nuovo progetto
-BUTTON_Browse_Tooltip=Selezionare una cartella in cui il progetto verr\u00E0
creato
+BUTTON_Browse_Tooltip=Selezionare una cartella in cui il progetto verr\u00e0
creato
#AddOn Menubar/Toolbat
#LBL_Preview=Preview:
@@ -121,7 +123,7 @@ LBL_Preview=Anteprima:
#TF_CommandErrorMessage=Parent must not be null.
#TF_IconCustomEditorErrorMessage=Image cannot be displayed.
TF_Command_Name_Tooltip=Nome interno del comando
-TF_Command_Context_Tooltip=Contesto in cui il comando sar\u00E0 visibile
+TF_Command_Context_Tooltip=Contesto in cui il comando sar\u00e0 visibile
TF_Command_Icon_Tooltip=Icona associata al comando
TF_Command_DisplayName_Tooltip=Nome visualizzato del comando
TF_CommandIconHighContrastBig=Alto Contrasto, 26x26
@@ -129,7 +131,7 @@ TF_CommandIconHighContrastSmall=Alto Con
TF_CommandIconLowContrastBig=Basso Contrasto 26x26
TF_CommandIconLowContrastSmall=Basso Contrasto 16x16
TF_CommandErrorMessage=L'elemento contenitore ('parent') deve essere
specificato.
-TF_IconCustomEditorErrorMessage=L'immagine non pu\u00F2 essere visualizzata.
+TF_IconCustomEditorErrorMessage=L'immagine non pu\u00f2 essere visualizzata.
#Meun tooltips
#TF_Menu_DisplayName_Tooltip=Display name of the menu
