Skip to content

Cleanup TableModelDialog and migrate away from deprecated JApplet #1338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ptziegler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Cleanup TableModelDialog and migrate away from deprecated JApplet #1338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.eclipse.wb.swing/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wb.swing;singleton:=true
Bundle-Version: 1.10.400.qualifier
Bundle-Version: 1.11.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.wb.internal.swing.Activator
Bundle-Vendor: %providerName
Expand Down
9 changes: 1 addition & 8 deletions ...wb.swing/src/org/eclipse/wb/internal/swing/model/property/editor/border/BorderDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2025 Google, Inc. and others.
* Copyright (c) 2011, 2026 Google, Inc. and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -62,8 +62,6 @@

import javax.swing.border.Border;

import swingintegration.example.EmbeddedSwingComposite2;

/**
* Dialog for {@link Border} editing.
*
Expand Down Expand Up @@ -193,11 +191,6 @@ public void handleEvent(Event event) {
GridDataFactory.create(previewGroup).spanH(2).grabH().fillH();
GridLayoutFactory.create(previewGroup);
previewGroup.setText(ModelMessages.BorderDialog_preview);
//
if (EmbeddedSwingComposite2.canUseAwt()) {
m_previewCanvas = new BorderPreviewCanvas(previewGroup, SWT.NONE);
GridDataFactory.create(m_previewCanvas).grab().fill().hintV(100);
}
}
//
updateGUI();
Expand Down
6 changes: 3 additions & 3 deletions ...g/src/org/eclipse/wb/internal/swing/model/property/editor/border/BorderPreviewCanvas.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2011, 2025 Google, Inc. and others.
* Copyright (c) 2011, 2026 Google, Inc. and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which is available at
Expand Down Expand Up @@ -28,15 +28,15 @@
import javax.swing.border.Border;
import javax.swing.border.LineBorder;

import swingintegration.example.EmbeddedSwingComposite2;
import swingintegration.example.EmbeddedSwingComposite;

/**
* {@link Composite} for displaying {@link Border}.
*
* @author scheglov_ke
* @coverage swing.property.editor
*/
public final class BorderPreviewCanvas extends EmbeddedSwingComposite2 {
public final class BorderPreviewCanvas extends EmbeddedSwingComposite {
private JPanel m_awtRoot;
private JPanel m_emptyPanel;
private JPanel m_filledPanel_1;
Expand Down
Loading
Loading