Compare commits
8 Commits
master
...
hzhao/mast
| Author | SHA1 | Date | |
|---|---|---|---|
|
da9b4259be | ||
|
|
eb54f17590 | ||
|
|
091822d2cf | ||
|
|
2031484561 | ||
|
|
804092e9ef | ||
|
|
85632a627b | ||
|
|
ec44a83f2f | ||
|
|
11305643d2 |
@@ -10,7 +10,7 @@
|
||||
</url>
|
||||
<requires>
|
||||
<import feature="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import feature="org.eclipse.m2e.feature" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import feature="org.talend.m2e.feature" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import feature="org.eclipse.equinox.p2.discovery.feature" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import feature="org.talend.utils.feature" version="0.0.0" match="greaterOrEqual"/>
|
||||
<import plugin="javax.xml.rpc-api" version="0.0.0" match="greaterOrEqual"/>
|
||||
|
||||
@@ -33,7 +33,7 @@ Require-Bundle: org.eclipse.ui,
|
||||
org.apache.commons.lang,
|
||||
org.talend.common.ui.runtime,
|
||||
org.talend.cwm.mip,
|
||||
org.apache.commons.codec,
|
||||
org.apache.commons.commons-codec,
|
||||
org.talend.studio.studio-utils,
|
||||
avro
|
||||
Bundle-ActivationPolicy: lazy
|
||||
|
||||
@@ -75,7 +75,8 @@ Require-Bundle: org.talend.model,
|
||||
com.fasterxml.jackson.core.jackson-databind,
|
||||
org.talend.cwm.mip,
|
||||
org.eclipse.gmf.runtime.notation,
|
||||
avro
|
||||
avro,
|
||||
org.apache.axis
|
||||
Eclipse-LazyStart: true
|
||||
Plugin-Class: org.talend.designer.core.DesignerPlugin
|
||||
Export-Package: org.talend.designer.core;
|
||||
|
||||
@@ -2,6 +2,7 @@ package org.talend.designer.core.ui.action;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.eclipse.gef.GraphicalEditPart;
|
||||
import org.eclipse.gef.ui.actions.SelectionAction;
|
||||
import org.eclipse.ui.IWorkbenchPart;
|
||||
import org.talend.core.model.components.ComponentCategory;
|
||||
@@ -79,7 +80,7 @@ public class DisableParallelizationAction extends SelectionAction {
|
||||
getCommandStack().execute(new DisableParallelizationCommand(node));
|
||||
} else if (o instanceof SubjobContainerPart) {
|
||||
boolean hasStartNode = false;
|
||||
List<NodeContainerPart> childNodes = ((SubjobContainerPart) o).getChildren();
|
||||
List<NodeContainerPart> childNodes = (List<NodeContainerPart>)((SubjobContainerPart) o).getChildren();
|
||||
for (NodeContainerPart childNode : childNodes) {
|
||||
NodeContainerPart part = (NodeContainerPart) childNode;
|
||||
NodeContainer node = (NodeContainer) part.getModel();
|
||||
|
||||
@@ -95,7 +95,7 @@ public class SetParallelizationAction extends SelectionAction {
|
||||
getCommandStack().execute(new SetParallelizationCommand(node));
|
||||
} else if (o instanceof SubjobContainerPart) {
|
||||
boolean hasStartNode = false;
|
||||
List<NodeContainerPart> childNodes = ((SubjobContainerPart) o).getChildren();
|
||||
List<NodeContainerPart> childNodes = (List<NodeContainerPart>)((SubjobContainerPart) o).getChildren();
|
||||
for (NodeContainerPart childNode : childNodes) {
|
||||
NodeContainerPart part = (NodeContainerPart) childNode;
|
||||
NodeContainer node = (NodeContainer) part.getModel();
|
||||
|
||||
@@ -1959,7 +1959,7 @@ public abstract class AbstractTalendEditor extends GraphicalEditorWithFlyoutPale
|
||||
selectedConnectionPart = null;
|
||||
} else if (keyEvent.stateMask == SWT.CTRL
|
||||
&& (keyCode == SWT.ARROW_UP || keyCode == SWT.ARROW_DOWN || keyCode == SWT.ARROW_LEFT || keyCode == SWT.ARROW_RIGHT)) {
|
||||
List<EditPart> parts = viewer.getSelectedEditParts();
|
||||
List<EditPart> parts = (List<EditPart>) viewer.getSelectedEditParts();
|
||||
if (parts == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -185,7 +185,7 @@ public class TalendSelectionManager extends SelectionManager {
|
||||
if (element instanceof SubjobContainerPart) {
|
||||
// childrens are NodeContainer part
|
||||
newSelection.remove(element);
|
||||
List<NodeContainerPart> nodeContainerParts = ((SubjobContainerPart) element).getChildren();
|
||||
List<NodeContainerPart> nodeContainerParts = (List<NodeContainerPart>)((SubjobContainerPart) element).getChildren();
|
||||
for (NodeContainerPart nodeContainerPart : nodeContainerParts) {
|
||||
for (Object object : nodeContainerPart.getChildren()) {
|
||||
if (object instanceof NodePart) {
|
||||
|
||||
@@ -130,7 +130,7 @@ public class JobletContainerPart extends NodeContainerPart implements ICrossPlat
|
||||
// ((JobletContainerFigure) figure).setInfoHint(node.getShowHintText());
|
||||
} else if (JobletContainer.UPDATE_JOBLET_CONTENT.equals(prop)) {
|
||||
refresh();
|
||||
List<AbstractGraphicalEditPart> childrens = getChildren();
|
||||
List<AbstractGraphicalEditPart> childrens = (List<AbstractGraphicalEditPart>) getChildren();
|
||||
for (AbstractGraphicalEditPart part : childrens) {
|
||||
part.refresh();
|
||||
}
|
||||
|
||||
@@ -205,7 +205,7 @@ public class NodeErrorEditPart extends AbstractSwtGraphicalEditPart
|
||||
@SuppressWarnings("unchecked")//$NON-NLS-1$
|
||||
public void setSelected(final int value) {
|
||||
if (value != SELECTED_NONE) {
|
||||
List<EditPart> listEditParts = this.getViewer().getSelectedEditParts();
|
||||
List<EditPart> listEditParts = (List<EditPart>)this.getViewer().getSelectedEditParts();
|
||||
if (listEditParts.size() != 1) {
|
||||
// getParent().removeEditPolicy(EditPolicy.LAYOUT_ROLE);
|
||||
} else {
|
||||
|
||||
@@ -265,7 +265,7 @@ public class NodeLabelEditPart extends AbstractSwtGraphicalEditPart
|
||||
@SuppressWarnings("unchecked")//$NON-NLS-1$
|
||||
public void setSelected(final int value) {
|
||||
if (value != SELECTED_NONE) {
|
||||
List<EditPart> listEditParts = this.getViewer().getSelectedEditParts();
|
||||
List<EditPart> listEditParts = (List<EditPart>)this.getViewer().getSelectedEditParts();
|
||||
if (listEditParts.size() != 1) {
|
||||
// getParent().removeEditPolicy(EditPolicy.LAYOUT_ROLE);
|
||||
} else {
|
||||
|
||||
@@ -196,7 +196,7 @@ public class NodeProgressBarPart extends AbstractSwtGraphicalEditPart
|
||||
@SuppressWarnings("unchecked")//$NON-NLS-1$
|
||||
public void setSelected(final int value) {
|
||||
if (value != SELECTED_NONE) {
|
||||
List<EditPart> listEditParts = this.getViewer().getSelectedEditParts();
|
||||
List<EditPart> listEditParts = (List<EditPart>)this.getViewer().getSelectedEditParts();
|
||||
if (listEditParts.size() != 1) {
|
||||
// getParent().removeEditPolicy(EditPolicy.LAYOUT_ROLE);
|
||||
} else {
|
||||
|
||||
@@ -88,8 +88,8 @@ public class TalendDrawerEditPart extends DrawerEditPart {
|
||||
}
|
||||
};
|
||||
getViewer().getControl().setData("ANIMATE", Boolean.TRUE); //$NON-NLS-1$
|
||||
fig.setExpanded(getDrawer().isInitiallyOpen());
|
||||
fig.setPinned(getDrawer().isInitiallyPinned());
|
||||
fig.setExpanded(getModel().isInitiallyOpen());
|
||||
fig.setPinned(getModel().isInitiallyPinned());
|
||||
|
||||
fig.getCollapseToggle().addFocusListener(new FocusListener.Stub() {
|
||||
|
||||
@@ -109,11 +109,11 @@ public class TalendDrawerEditPart extends DrawerEditPart {
|
||||
String property = evt.getPropertyName();
|
||||
if (property.equals(PaletteDrawer.PROPERTY_INITIAL_STATUS)) {
|
||||
boolean isExpaned = getDrawerFigure().isExpanded();
|
||||
if (isExpaned == getDrawer().isInitiallyOpen()) {
|
||||
if (isExpaned == getModel().isInitiallyOpen()) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
getDrawerFigure().setExpanded(getDrawer().isInitiallyOpen());
|
||||
getDrawerFigure().setExpanded(getModel().isInitiallyOpen());
|
||||
refreshVisuals();
|
||||
} catch (Exception e) {
|
||||
// do nothing
|
||||
@@ -127,8 +127,8 @@ public class TalendDrawerEditPart extends DrawerEditPart {
|
||||
getDrawerFigure().setToolTip(createToolTip());
|
||||
|
||||
if (cssStyleSetting.isShowFolderImage()) {
|
||||
ImageDescriptor img = getDrawer().getSmallIcon();
|
||||
if (img == null && getDrawer().showDefaultIcon()) {
|
||||
ImageDescriptor img = getModel().getSmallIcon();
|
||||
if (img == null && getModel().showDefaultIcon()) {
|
||||
img = InternalImages.DESC_FOLDER_OPEN;
|
||||
}
|
||||
setImageDescriptor(img);
|
||||
@@ -140,7 +140,7 @@ public class TalendDrawerEditPart extends DrawerEditPart {
|
||||
boolean showPin = getPreferenceSource().getAutoCollapseSetting() == PaletteViewerPreferences.COLLAPSE_AS_NEEDED;
|
||||
getDrawerFigure().showPin(showPin);
|
||||
|
||||
Color background = getDrawer().getDrawerType().equals(PaletteTemplateEntry.PALETTE_TYPE_TEMPLATE) ? PaletteColorUtil.WIDGET_LIST_BACKGROUND
|
||||
Color background = getModel().getDrawerType().equals(PaletteTemplateEntry.PALETTE_TYPE_TEMPLATE) ? PaletteColorUtil.WIDGET_LIST_BACKGROUND
|
||||
: null;
|
||||
getDrawerFigure().getScrollpane().setBackgroundColor(background);
|
||||
}
|
||||
|
||||
@@ -461,9 +461,9 @@ public class TalendPaletteViewer extends PaletteViewer {
|
||||
if (!alreadyExist) {
|
||||
TalendEditorPaletteFactory.addNewFavoriteIntoPreference(component.getLabel());
|
||||
CombinedTemplateCreationEntry newFavorite = TalendEditorPaletteFactory.createEntryFrom(component);
|
||||
newFavorite.setParent(favoritesEditPart.getDrawer());
|
||||
newFavorite.setParent(favoritesEditPart.getModel());
|
||||
EditPart child = favoritesEditPart.createChild(newFavorite);
|
||||
PaletteDrawer paletteDrawer = favoritesEditPart.getDrawer();
|
||||
PaletteDrawer paletteDrawer = favoritesEditPart.getModel();
|
||||
if (paletteDrawer != null) {
|
||||
paletteDrawer.add(insertIndex, newFavorite);
|
||||
}
|
||||
@@ -484,7 +484,7 @@ public class TalendPaletteViewer extends PaletteViewer {
|
||||
TalendEntryEditPart entryEditPart = (TalendEntryEditPart) obj;
|
||||
CombinedTemplateCreationEntry entryModule = (CombinedTemplateCreationEntry) entryEditPart.getModel();
|
||||
if (entryModule.getLabel().equals(component.getLabel())) {
|
||||
PaletteDrawer paletteDrawer = favoritesEditPart.getDrawer();
|
||||
PaletteDrawer paletteDrawer = favoritesEditPart.getModel();
|
||||
if (paletteDrawer != null) {
|
||||
paletteDrawer.remove(entryModule);
|
||||
}
|
||||
@@ -537,9 +537,9 @@ public class TalendPaletteViewer extends PaletteViewer {
|
||||
// if (!alreadyExist) {
|
||||
TalendCombinedTemplateCreationEntry newRecently = TalendEditorPaletteFactory.createEntryFrom(component);
|
||||
newRecently.setTimestemp(new Date());
|
||||
newRecently.setParent(recentlyUsedEditPart.getDrawer());
|
||||
newRecently.setParent(recentlyUsedEditPart.getModel());
|
||||
EditPart child = recentlyUsedEditPart.createChild(newRecently);
|
||||
PaletteDrawer paletteDrawer = recentlyUsedEditPart.getDrawer();
|
||||
PaletteDrawer paletteDrawer = recentlyUsedEditPart.getModel();
|
||||
if (paletteDrawer != null) {
|
||||
// paletteDrawer.add(insertIndex, newRecently);
|
||||
paletteDrawer.add(0, newRecently);
|
||||
@@ -608,7 +608,7 @@ public class TalendPaletteViewer extends PaletteViewer {
|
||||
// entryLabel = ((TalendCombinedTemplateCreationEntry) component).getComponentName();
|
||||
}
|
||||
if (entryModule.getLabel().equals(entryLabel)) {
|
||||
PaletteDrawer paletteDrawer = recentlyUsedEditPart.getDrawer();
|
||||
PaletteDrawer paletteDrawer = recentlyUsedEditPart.getModel();
|
||||
if (paletteDrawer != null) {
|
||||
paletteDrawer.remove(entryModule);
|
||||
}
|
||||
|
||||
@@ -181,7 +181,7 @@ public class SubjobContainerPart extends AbstractSwtGraphicalEditPart
|
||||
String prop = evt.getPropertyName();
|
||||
if (SubjobContainer.UPDATE_SUBJOB_CONTENT.equals(prop)) {
|
||||
refresh();
|
||||
List<AbstractGraphicalEditPart> childrens = getChildren();
|
||||
List<AbstractGraphicalEditPart> childrens = (List<AbstractGraphicalEditPart>)getChildren();
|
||||
for (AbstractGraphicalEditPart part : childrens) {
|
||||
part.refresh();
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ public class XmlDragSourceListener extends MapperDragSourceListener {
|
||||
|
||||
if (type != null) {
|
||||
if (filtedSelection.size() > 1) {
|
||||
partList.addAll(lastSelection.getParent().getChildren());
|
||||
partList.addAll((List<TableEntityPart>)lastSelection.getParent().getChildren());
|
||||
Map<EditPart, Integer> partAndIndex = new HashMap<EditPart, Integer>();
|
||||
if (type == TransferdType.INPUT) {
|
||||
for (EditPart treePart : filtedSelection) {
|
||||
@@ -100,7 +100,7 @@ public class XmlDragSourceListener extends MapperDragSourceListener {
|
||||
partList = MapperUtils.getFlatChildrenPartList(abstractInOutTreePart);
|
||||
}
|
||||
} else {
|
||||
partList.addAll(lastSelection.getParent().getChildren());
|
||||
partList.addAll((List<TableEntityPart>)lastSelection.getParent().getChildren());
|
||||
}
|
||||
|
||||
for (EditPart selected : filtedSelection) {
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-4.1.2-20200903124306_modified_talend.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/poi-scratchpad-5.2.2.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/simpleexcel-2.9-20230830.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/talendExcel-1.6-20200923.jar"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/talendMsgMailUtil-1.2-20201022.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
||||
<attributes>
|
||||
|
||||
@@ -157,4 +157,10 @@ public class DirImportStructureProvider implements ILeveledImportStructureProvid
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() throws Exception {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user