Skip to content

D
dbeaver

suliangchun / dbeaver
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
D
dbeaver

体验新版 GitCode，发现更多精彩内容 >>

提交 2b070fce 编写于 作者: J jurgen
浏览文件
操作

ERD refactoring 

Former-commit-id: 9a070492
上级 15f67a26
隐藏空白更改
内联 并排
Showing with 41 addition and 41 deletion
plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java
浏览文件 @ 2b070fce
......@@ -183,7 +183,7 @@ public class DBeaverCore implements DBPApplication {
try {
pluginService.activateService();
activatedServices.add(pluginService);
} catch (Exception e) {
} catch (Throwable e) {
log.error("Error activating plugin service", e);
}
}
......
plugins/org.jkiss.dbeaver.erd/META-INF/MANIFEST.MF
浏览文件 @ 2b070fce
......@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: ERD Plug-in
Bundle-SymbolicName: org.jkiss.dbeaver.ext.erd;singleton:=true
Bundle-Version: 2.0.12
Bundle-Activator: org.jkiss.dbeaver.ext.erd.Activator
Bundle-Activator: org.jkiss.dbeaver.ext.erd.ERDActivator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.core.expressions,
......
plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/Activator.java → plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/ERDActivator.java
浏览文件 @ 2b070fce
......@@ -29,13 +29,13 @@ import java.util.ResourceBundle;
/**
* The activator class controls the plug-in life cycle
*/
public class Activator extends AbstractUIPlugin {
public class ERDActivator extends AbstractUIPlugin {
// The plug-in ID
public static final String PLUGIN_ID = "org.jkiss.dbeaver.ext.erd";
// The shared instance
private static Activator plugin;
private static ERDActivator plugin;
private static ResourceBundle resourceBundle;
......@@ -44,7 +44,7 @@ public class Activator extends AbstractUIPlugin {
/**
* The constructor
*/
public Activator() {
public ERDActivator() {
}
@Override
......@@ -75,7 +75,7 @@ public class Activator extends AbstractUIPlugin {
*
* @return the shared instance
*/
public static Activator getDefault() {
public static ERDActivator getDefault() {
return plugin;
}
......
plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/ERDConstants.java
浏览文件 @ 2b070fce
......@@ -50,7 +50,7 @@ public class ERDConstants {
public static final String COLOR_ERD_ATTR_BACKGROUND = "org.jkiss.dbeaver.erd.diagram.attributes.background";
public static final String COLOR_ERD_ATTR_FOREGROUND = "org.jkiss.dbeaver.erd.diagram.attributes.foreground";
public static final String ICON_LOCATION_PREFIX = "platform:/plugin/" + Activator.PLUGIN_ID + "/icons/";
public static final String ICON_LOCATION_PREFIX = "platform:/plugin/" + ERDActivator.PLUGIN_ID + "/icons/";
public static DBSEntityConstraintType CONSTRAINT_LOGICAL_FK = new DBSEntityConstraintType("erdkey", "Logical Key", null, true, false);
}
plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/ERDPreferencesInitializer.java
浏览文件 @ 2b070fce
......@@ -13,7 +13,7 @@ public class ERDPreferencesInitializer extends AbstractPreferenceInitializer {
@Override
public void initializeDefaultPreferences() {
// Init default preferences
DBPPreferenceStore store = new BundlePreferenceStore(Activator.getDefault().getBundle());
DBPPreferenceStore store = new BundlePreferenceStore(ERDActivator.getDefault().getBundle());
RuntimeUtils.setDefaultPreferenceValue(store, ERDConstants.PREF_PRINT_PAGE_MODE, ERDConstants.PRINT_MODE_DEFAULT);
RuntimeUtils.setDefaultPreferenceValue(store, ERDConstants.PREF_PRINT_MARGIN_TOP, ERDConstants.PRINT_MARGIN_DEFAULT);
RuntimeUtils.setDefaultPreferenceValue(store, ERDConstants.PREF_PRINT_MARGIN_BOTTOM, ERDConstants.PRINT_MARGIN_DEFAULT);
......
plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/action/DiagramLayoutAction.java
浏览文件 @ 2b070fce
......@@ -22,7 +22,7 @@
package org.jkiss.dbeaver.ext.erd.action;
import org.eclipse.jface.action.Action;
import org.jkiss.dbeaver.ext.erd.Activator;
import org.jkiss.dbeaver.ext.erd.ERDActivator;
import org.jkiss.dbeaver.ext.erd.ERDMessages;
import org.jkiss.dbeaver.ext.erd.editor.ERDEditorPart;
......@@ -37,7 +37,7 @@ public class DiagramLayoutAction extends Action
public DiagramLayoutAction(ERDEditorPart editor)
{
super(ERDMessages.action_diagram_layout_name, Activator.getImageDescriptor("icons/arrangeall.png")); //$NON-NLS-2$
super(ERDMessages.action_diagram_layout_name, ERDActivator.getImageDescriptor("icons/arrangeall.png")); //$NON-NLS-2$
this.editor = editor;
}
......
plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/action/DiagramToggleGridAction.java
浏览文件 @ 2b070fce
......@@ -21,7 +21,7 @@
package org.jkiss.dbeaver.ext.erd.action;
import org.eclipse.jface.action.Action;
import org.jkiss.dbeaver.ext.erd.Activator;
import org.jkiss.dbeaver.ext.erd.ERDActivator;
import org.jkiss.dbeaver.ext.erd.ERDConstants;
import org.jkiss.dbeaver.model.DBPPreferenceStore;
import org.jkiss.dbeaver.runtime.RuntimeUtils;
......@@ -35,13 +35,13 @@ public class DiagramToggleGridAction extends Action
{
public DiagramToggleGridAction()
{
super("Toggle Grid", Activator.getImageDescriptor("icons/layer_grid.png"));
super("Toggle Grid", ERDActivator.getImageDescriptor("icons/layer_grid.png"));
}
@Override
public void run()
{
final DBPPreferenceStore store = Activator.getDefault().getPreferences();
final DBPPreferenceStore store = ERDActivator.getDefault().getPreferences();
final boolean gridEnabled = store.getBoolean(ERDConstants.PREF_GRID_ENABLED);
store.setValue(ERDConstants.PREF_GRID_ENABLED, !gridEnabled);
RuntimeUtils.savePreferenceStore(store);
......
plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDEditorPart.java
浏览文件 @ 2b070fce
......@@ -65,7 +65,7 @@ import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.PropertySheetPage;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.core.Log;
import org.jkiss.dbeaver.ext.erd.Activator;
import org.jkiss.dbeaver.ext.erd.ERDActivator;
import org.jkiss.dbeaver.ext.erd.ERDConstants;
import org.jkiss.dbeaver.ext.erd.action.DiagramLayoutAction;
import org.jkiss.dbeaver.ext.erd.action.DiagramRefreshAction;
......@@ -160,7 +160,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
//getSite().getWorkbenchWindow().getSelectionService().addSelectionListener(this);
configPropertyListener = new ConfigPropertyListener();
Activator.getDefault().getPreferenceStore().addPropertyChangeListener(configPropertyListener);
ERDActivator.getDefault().getPreferenceStore().addPropertyChangeListener(configPropertyListener);
}
@Override
......@@ -195,7 +195,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
@Override
public void dispose()
{
Activator.getDefault().getPreferenceStore().removePropertyChangeListener(configPropertyListener);
ERDActivator.getDefault().getPreferenceStore().removePropertyChangeListener(configPropertyListener);
if (diagramLoadingJob != null) {
diagramLoadingJob.cancel();
......@@ -394,7 +394,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
getEditorSite().registerContextMenu(getClass().getName() + ".EditorContext", manager, graphicalViewer, true); //$NON-NLS-1$
*/
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
IPreferenceStore store = ERDActivator.getDefault().getPreferenceStore();
graphicalViewer.setProperty(SnapToGrid.PROPERTY_GRID_ENABLED, store.getBoolean(ERDConstants.PREF_GRID_ENABLED));
graphicalViewer.setProperty(SnapToGrid.PROPERTY_GRID_VISIBLE, store.getBoolean(ERDConstants.PREF_GRID_ENABLED));
......@@ -571,10 +571,10 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
separator.setUserModificationPermission(PaletteEntry.PERMISSION_NO_MODIFICATION);
controls.add(separator);
final ImageDescriptor connectImage = Activator.getImageDescriptor("icons/connect.png");
final ImageDescriptor connectImage = ERDActivator.getImageDescriptor("icons/connect.png");
controls.add(new ConnectionCreationToolEntry("Connection", "Create Connection", null, connectImage, connectImage));
final ImageDescriptor noteImage = Activator.getImageDescriptor("icons/note.png");
final ImageDescriptor noteImage = ERDActivator.getImageDescriptor("icons/note.png");
controls.add(new CreationToolEntry(
"Note",
"Create Note",
......@@ -597,19 +597,19 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
/*
PaletteDrawer drawer = new PaletteDrawer("New Component",
Activator.getImageDescriptor("icons/connection.gif"));
ERDActivator.getImageDescriptor("icons/connection.gif"));
List<CombinedTemplateCreationEntry> entries = new ArrayList<CombinedTemplateCreationEntry>();
CombinedTemplateCreationEntry tableEntry = new CombinedTemplateCreationEntry("New Table", "Create a new table",
ERDEntity.class, new DataElementFactory(ERDEntity.class),
Activator.getImageDescriptor("icons/table.gif"),
Activator.getImageDescriptor("icons/table.gif"));
ERDActivator.getImageDescriptor("icons/table.gif"),
ERDActivator.getImageDescriptor("icons/table.gif"));
CombinedTemplateCreationEntry columnEntry = new CombinedTemplateCreationEntry("New Column", "Add a new column",
ERDEntityAttribute.class, new DataElementFactory(ERDEntityAttribute.class),
Activator.getImageDescriptor("icons/column.gif"),
Activator.getImageDescriptor("icons/column.gif"));
ERDActivator.getImageDescriptor("icons/column.gif"),
ERDActivator.getImageDescriptor("icons/column.gif"));
entries.add(tableEntry);
entries.add(columnEntry);
......@@ -738,7 +738,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
PrintFigureOperation printOp = new PrintFigureOperation(new Printer(data), rootFigure);
// Set print preferences
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
IPreferenceStore store = ERDActivator.getDefault().getPreferenceStore();
printOp.setPrintMode(store.getInt(ERDConstants.PREF_PRINT_PAGE_MODE));
printOp.setPrintMargin(new Insets(
store.getInt(ERDConstants.PREF_PRINT_MARGIN_TOP),
......@@ -810,7 +810,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
graphicalViewer.setProperty(SnapToGrid.PROPERTY_GRID_ENABLED, enabled);
graphicalViewer.setProperty(SnapToGrid.PROPERTY_GRID_VISIBLE, enabled);
} else if (ERDConstants.PREF_GRID_WIDTH.equals(event.getProperty()) || ERDConstants.PREF_GRID_HEIGHT.equals(event.getProperty())) {
final IPreferenceStore store = Activator.getDefault().getPreferenceStore();
final IPreferenceStore store = ERDActivator.getDefault().getPreferenceStore();
graphicalViewer.setProperty(SnapToGrid.PROPERTY_GRID_SPACING, new Dimension(
store.getInt(ERDConstants.PREF_GRID_WIDTH),
store.getInt(ERDConstants.PREF_GRID_HEIGHT)));
......
plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDPalettePreferences.java
浏览文件 @ 2b070fce
......@@ -22,7 +22,7 @@ package org.jkiss.dbeaver.ext.erd.editor;
import org.eclipse.draw2d.PositionConstants;
import org.eclipse.gef.ui.palette.FlyoutPaletteComposite.FlyoutPreferences;
import org.jkiss.dbeaver.ext.erd.Activator;
import org.jkiss.dbeaver.ext.erd.ERDActivator;
/**
......@@ -41,7 +41,7 @@ public class ERDPalettePreferences implements FlyoutPreferences
@Override
public int getDockLocation()
{
int location = Activator.getDefault().getPreferenceStore().getInt(PALETTE_DOCK_LOCATION);
int location = ERDActivator.getDefault().getPreferenceStore().getInt(PALETTE_DOCK_LOCATION);
if (location == 0)
{
return PositionConstants.WEST;
......@@ -52,13 +52,13 @@ public class ERDPalettePreferences implements FlyoutPreferences
@Override
public int getPaletteState()
{
return Activator.getDefault().getPreferenceStore().getInt(PALETTE_STATE);
return ERDActivator.getDefault().getPreferenceStore().getInt(PALETTE_STATE);
}
@Override
public int getPaletteWidth()
{
int width = Activator.getDefault().getPreferenceStore().getInt(PALETTE_SIZE);
int width = ERDActivator.getDefault().getPreferenceStore().getInt(PALETTE_SIZE);
if (width == 0)
return DEFAULT_PALETTE_WIDTH;
return width;
......@@ -67,19 +67,19 @@ public class ERDPalettePreferences implements FlyoutPreferences
@Override
public void setDockLocation(int location)
{
Activator.getDefault().getPreferenceStore().setValue(PALETTE_DOCK_LOCATION, location);
ERDActivator.getDefault().getPreferenceStore().setValue(PALETTE_DOCK_LOCATION, location);
}
@Override
public void setPaletteState(int state)
{
Activator.getDefault().getPreferenceStore().setValue(PALETTE_STATE, state);
ERDActivator.getDefault().getPreferenceStore().setValue(PALETTE_STATE, state);
}
@Override
public void setPaletteWidth(int width)
{
Activator.getDefault().getPreferenceStore().setValue(PALETTE_SIZE, width);
ERDActivator.getDefault().getPreferenceStore().setValue(PALETTE_SIZE, width);
}
}
\ No newline at end of file
plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/editor/ERDPreferencePage.java
浏览文件 @ 2b070fce
......@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.*;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.IWorkbenchPropertyPage;
import org.jkiss.dbeaver.ext.erd.Activator;
import org.jkiss.dbeaver.ext.erd.ERDActivator;
import org.jkiss.dbeaver.ext.erd.ERDConstants;
import org.jkiss.dbeaver.ext.erd.ERDMessages;
import org.jkiss.dbeaver.model.DBPPreferenceStore;
......@@ -58,7 +58,7 @@ public class ERDPreferencePage extends PreferencePage implements IWorkbenchPrefe
@Override
protected Control createContents(Composite parent)
{
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
IPreferenceStore store = ERDActivator.getDefault().getPreferenceStore();
Composite composite = UIUtils.createPlaceholder(parent, 2, 5);
......@@ -137,7 +137,7 @@ public class ERDPreferencePage extends PreferencePage implements IWorkbenchPrefe
@Override
public boolean performOk()
{
DBPPreferenceStore store = Activator.getDefault().getPreferences();
DBPPreferenceStore store = ERDActivator.getDefault().getPreferences();
store.setValue(ERDConstants.PREF_GRID_ENABLED, gridCheck.getSelection());
store.setValue(ERDConstants.PREF_GRID_SNAP_ENABLED, snapCheck.getSelection());
......
plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/model/EntityDiagram.java
浏览文件 @ 2b070fce
......@@ -22,7 +22,7 @@ package org.jkiss.dbeaver.ext.erd.model;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.Rectangle;
import org.jkiss.dbeaver.ext.erd.Activator;
import org.jkiss.dbeaver.ext.erd.ERDActivator;
import org.jkiss.dbeaver.ext.erd.editor.ERDAttributeVisibility;
import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
import org.jkiss.dbeaver.model.struct.DBSEntity;
......@@ -56,7 +56,7 @@ public class EntityDiagram extends ERDObject<DBSObject>
if (name == null)
throw new NullPointerException("Name cannot be null");
this.name = name;
this.attributeVisibility = ERDAttributeVisibility.getDefaultVisibility(Activator.getDefault().getPreferenceStore());
this.attributeVisibility = ERDAttributeVisibility.getDefaultVisibility(ERDActivator.getDefault().getPreferenceStore());
}
......@@ -68,7 +68,7 @@ public class EntityDiagram extends ERDObject<DBSObject>
public void setAttributeVisibility(ERDAttributeVisibility attributeVisibility)
{
this.attributeVisibility = attributeVisibility;
ERDAttributeVisibility.setDefaultVisibility(Activator.getDefault().getPreferences(), attributeVisibility);
ERDAttributeVisibility.setDefaultVisibility(ERDActivator.getDefault().getPreferences(), attributeVisibility);
}
public synchronized void addTable(ERDEntity entity, boolean reflect)
......
plugins/org.jkiss.dbeaver.erd/src/org/jkiss/dbeaver/ext/erd/part/DiagramPart.java
浏览文件 @ 2b070fce
......@@ -25,7 +25,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.Control;
import org.jkiss.dbeaver.ext.erd.Activator;
import org.jkiss.dbeaver.ext.erd.ERDActivator;
import org.jkiss.dbeaver.ext.erd.ERDConstants;
import org.jkiss.dbeaver.ext.erd.ERDMessages;
import org.jkiss.dbeaver.ext.erd.figures.EntityDiagramFigure;
......@@ -316,7 +316,7 @@ public class DiagramPart extends PropertyAwarePart {
public Object getAdapter(Class key)
{
if (key == SnapToHelper.class) {
final IPreferenceStore store = Activator.getDefault().getPreferenceStore();
final IPreferenceStore store = ERDActivator.getDefault().getPreferenceStore();
if (store.getBoolean(ERDConstants.PREF_GRID_ENABLED) && store.getBoolean(ERDConstants.PREF_GRID_SNAP_ENABLED)) {
return new SnapToGrid(this);
} else {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或