Skip to content

Commit

Permalink
Fixes ticket:5733 Don't use the qualified path
Browse files Browse the repository at this point in the history
  • Loading branch information
adeas31 committed Jan 7, 2020
1 parent 9092721 commit aad85fa
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions OMEdit/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp
Expand Up @@ -1096,10 +1096,9 @@ void DuplicateClassDialog::duplicateClass()
return;
}
}
QString newClassPath = (mpPathTextBox->text().isEmpty() ? "" : mpPathTextBox->text() + ".") + mpNameTextBox->text();
// Ticket #5668 check for invalid names.
MainWindow::instance()->getOMCProxy()->setLoggingEnabled(false);
QList<QString> result = MainWindow::instance()->getOMCProxy()->parseString(QString("model %1 end %2;").arg(newClassPath, newClassPath), "<interactive>", false);
QList<QString> result = MainWindow::instance()->getOMCProxy()->parseString(QString("model %1 end %1;").arg(mpNameTextBox->text()), "<interactive>", false);
MainWindow::instance()->getOMCProxy()->setLoggingEnabled(true);
if (result.isEmpty()) {
QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName, Helper::error),
Expand All @@ -1108,7 +1107,7 @@ void DuplicateClassDialog::duplicateClass()
return;
}
// check if new class already exists

QString newClassPath = (mpPathTextBox->text().isEmpty() ? "" : mpPathTextBox->text() + ".") + mpNameTextBox->text();
if (MainWindow::instance()->getOMCProxy()->existClass(newClassPath) || pLibraryTreeModel->findLibraryTreeItemOneLevel(newClassPath)) {
QMessageBox::critical(MainWindow::instance(), QString("%1 - %2").arg(Helper::applicationName, Helper::error),
GUIMessages::getMessage(GUIMessages::MODEL_ALREADY_EXISTS).arg("class").arg(mpNameTextBox->text())
Expand Down

0 comments on commit aad85fa

Please sign in to comment.