Skip to content

Conversation

@mbien
Copy link
Member

@mbien mbien commented Oct 16, 2025

resolves hundreds of warnings and shortens classpath a bit (which was already a problem in past on the windows CI runner).

[1/3] Removed deprecated ProgressHandleFactory::createHandle usage
[2/3] Removed deprecated ProgressUtils and AggregateProgressFactory usage
[3/3] Removed org.netbeans.api.progress.nb dependency where possible

left are just a few edge cases which had no direct replacements

history:

This effort started pre-apache (archived commit) and was never completed.

@mbien mbien added Code cleanup tests ci:all-tests [ci] enable all tests labels Oct 16, 2025
@mbien mbien added this to the NB29 milestone Oct 16, 2025
@mbien mbien marked this pull request as ready for review October 16, 2025 19:34
@mbien mbien force-pushed the remove-deprecated-progresshandlefactory-usage branch 2 times, most recently from 1500add to ee9dc54 Compare October 16, 2025 23:57
mbien added 2 commits October 17, 2025 01:58
replaced with BaseProgressUtils and BasicAggregateProgressFactory calls
left some edge cases which had no direct replacements
@mbien mbien force-pushed the remove-deprecated-progresshandlefactory-usage branch from ee9dc54 to fa577ca Compare October 17, 2025 00:02
Comment on lines 830 to 879
private void resultToggleButtonItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_resultToggleButtonItemStateChanged
if (resultToggleButton.isSelected()) {//GEN-LAST:event_resultToggleButtonItemStateChanged
private void resultToggleButtonItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_resultToggleButtonItemStateChanged
if (resultToggleButton.isSelected()) {
((CardLayout) (executionPanel.getLayout())).first(executionPanel);
sqlToggleButton.setSelected(false);
}
}
}//GEN-LAST:event_resultToggleButtonItemStateChanged

private void sqlToggleButtonItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_sqlToggleButtonItemStateChanged
if (sqlToggleButton.isSelected()) {//GEN-HEADEREND:event_sqlToggleButtonItemStateChanged
((CardLayout) (executionPanel.getLayout())).last(executionPanel);//GEN-LAST:event_sqlToggleButtonItemStateChanged
private void sqlToggleButtonItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_sqlToggleButtonItemStateChanged
if (sqlToggleButton.isSelected()) {
((CardLayout) (executionPanel.getLayout())).last(executionPanel);
resultToggleButton.setSelected(false);
}
}
}//GEN-LAST:event_sqlToggleButtonItemStateChanged

private void runJPQLButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_runJPQLButtonActionPerformed
// Fix - 138856
if(jpqlEditor.getText().trim().equals("")) {
switchToResultView();
setStatus(NbBundle.getMessage(JPQLEditorTopComponent.class, "emptyQuery"));
return;
}
if (puComboBox.getSelectedItem() == null) {
logger.info("hibernate configuration combo box is empty.");
switchToResultView();
setStatus(NbBundle.getMessage(JPQLEditorTopComponent.class, "emptyConfiguration"));
return;
}
runJPQLButton.setEnabled(false);
try {
ph = ProgressHandleFactory.createHandle(//GEN-HEADEREND:event_runJPQLButtonActionPerformed
NbBundle.getMessage(JPQLEditorTopComponent.class, "progressTaskname"));//GEN-LAST:event_runJPQLButtonActionPerformed
private void runJPQLButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_runJPQLButtonActionPerformed
// Fix - 138856
if(jpqlEditor.getText().trim().equals("")) {
switchToResultView();
setStatus(NbBundle.getMessage(JPQLEditorTopComponent.class, "emptyQuery"));
return;
}
if (puComboBox.getSelectedItem() == null) {
logger.info("hibernate configuration combo box is empty.");
switchToResultView();
setStatus(NbBundle.getMessage(JPQLEditorTopComponent.class, "emptyConfiguration"));
return;
}
runJPQLButton.setEnabled(false);
try {
ph = ProgressHandle.createHandle(
NbBundle.getMessage(JPQLEditorTopComponent.class, "progressTaskname"));
isSqlTranslationProcessDone = true;//will be reparsed in execution thread
if (hqlParserTask != null && !hqlParserTask.isFinished() && (hqlParserTask.getDelay() != 0)) {
hqlParserTask.cancel();
}
FileObject pXml = puObject.getPrimaryFile();
Project project = pXml != null ? FileOwnerQuery.getOwner(pXml) : null;
PersistenceEnvironment pe = project != null ? project.getLookup().lookup(PersistenceEnvironment.class) : null;

PersistenceUnit pu = (PersistenceUnit) puConfigMap.get(puComboBox.getSelectedItem());
ph.start(100);
controller.executeJPQLQuery(jpqlEditor.getText(),
puObject.getPersistence(),
pu,
pe,
getMaxRowCount(),
ph);
} catch (Exception ex) {
Exceptions.printStackTrace(ex);
}
}
}//GEN-LAST:event_runJPQLButtonActionPerformed
Copy link
Member Author

@mbien mbien Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

had to repair this section before being able to edit it. There was something wrong with the cogegen start/end markers.

@mbien mbien requested a review from sdedic October 17, 2025 00:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant