Compare commits

...

7 Commits

Author SHA1 Message Date
bhe-talendbj
2970bab12b fix(TUP-41249): update manifest timestamp (#6665)
* fix(TUP-41249): update manifest timestamp

* fix(TUP-41249): update type of time
2023-12-22 19:45:55 +08:00
bhe-talendbj
5a2cc479ed chore(TUP-41184): update maven repo (#6663) 2023-12-22 16:58:53 +08:00
bhe-talendbj
1954f09c18 fix(TUP-41249): correct allowed seconds for pat (#6632) 2023-12-13 17:39:59 +08:00
apoltavtsev
dec6f1b934 APPINT-36161: Correct build type for child Route job (#6619) 2023-12-11 09:42:01 +01:00
kjwang
6409a47cdd Fix TUP-41174 old version of Teradata related jars download fail (#6620)
* Fix TUP-41174 old version of Teradata related jars download fail
https://jira.talendforge.org/browse/TUP-41174
2023-12-11 15:50:30 +08:00
Zhiwei Xue
704a6dcb26 fix(TUP-41154):TcompV0 metadata refresh issue when only parts feature (#6617)
installed
2023-12-08 18:20:41 +08:00
sbliu
1a96cdc0aa Revert "fix(TUP-41057) add dnd support for dynamic setting's tableviewer (#6592)" (#6613)
This reverts commit 2019954122.
2023-12-08 15:33:56 +08:00
8 changed files with 8 additions and 122 deletions

View File

@@ -1,101 +0,0 @@
// ============================================================================
//
// Copyright (C) 2006-2023 Talend Inc. - www.talend.com
//
// This source code is available under agreement available at
// %InstallDIR%\features\org.talend.rcp.branding.%PRODUCTNAME%\%PRODUCTNAME%license.txt
//
// You should have received a copy of the agreement
// along with this program; if not, write to Talend SA
// 9 rue Pages 92150 Suresnes, France
//
// ============================================================================
package org.talend.commons.ui.swt.dnd;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.ViewerCell;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DropTarget;
import org.eclipse.swt.dnd.DropTargetAdapter;
import org.eclipse.swt.dnd.DropTargetEvent;
import org.eclipse.swt.dnd.TextTransfer;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
public class DNDTableViewerHelper {
public static void addDndSupport(final TableViewer tableViewer) {
if(tableViewer == null) {
return;
}
DropTarget dropTarget = new DropTarget(tableViewer.getTable(), DND.DROP_DEFAULT | DND.DROP_COPY);
dropTarget.setTransfer(new Transfer[] { TextTransfer.getInstance()});
dropTarget.addDropListener(new DropTargetAdapter() {
@Override
public void dragOver(DropTargetEvent event) {
if(!isColumnDroptable(tableViewer, getTargetColumn(event))) {
event.detail = DND.DROP_NONE;
} else {
event.detail = DND.DROP_COPY;
}
}
@Override
public void dragEnter(DropTargetEvent event) {
// Allow dropping text only
for (int i = 0, n = event.dataTypes.length; i < n; i++) {
if (TextTransfer.getInstance().isSupportedType(event.dataTypes[i])) {
event.currentDataType = event.dataTypes[i];
}
}
}
@Override
public void drop(DropTargetEvent event) {
if (ifAnyTextDropped(event)) {
pasteToTable(event);
}
}
private boolean ifAnyTextDropped(DropTargetEvent event) {
return TextTransfer.getInstance().isSupportedType(event.currentDataType);
}
private void pasteToTable(DropTargetEvent event) {
int columnIndex = getTargetColumn(event);
if(isColumnDroptable(tableViewer, columnIndex)) {
TableItem item = (TableItem) event.item;
String originContext = item.getText(columnIndex);
String idColmn = (String) tableViewer.getColumnProperties()[columnIndex];
ICellModifier cellModifier = tableViewer.getCellModifier();
cellModifier.modify(event.item, idColmn, originContext + (String)event.data);
}
}
private boolean isColumnDroptable(final TableViewer tableViewer, int columnIndex) {
CellEditor[] cellEditors = tableViewer.getCellEditors();
boolean isTextCellEditor = cellEditors[columnIndex] != null
&& cellEditors[columnIndex].getControl() instanceof Text;
return isTextCellEditor;
}
private int getTargetColumn(DropTargetEvent event) {
Point posInTable = tableViewer.getTable().toControl(event.x, event.y);
ViewerCell cell = tableViewer.getCell(posInTable);
int columnIndex = 0;
if(cell != null) {
columnIndex = cell.getColumnIndex();
}
return columnIndex;
}
});
}
}

View File

@@ -24,7 +24,6 @@ import org.talend.commons.ui.runtime.swt.tableviewer.TableViewerCreatorColumnNot
import org.talend.commons.ui.runtime.swt.tableviewer.TableViewerCreatorNotModifiable;
import org.talend.commons.ui.runtime.swt.tableviewer.behavior.ITableCellValueModifiedListener;
import org.talend.commons.ui.runtime.swt.tableviewer.data.AccessorUtils;
import org.talend.commons.ui.swt.dnd.DNDTableViewerHelper;
import org.talend.commons.ui.swt.extended.table.ModifyBeanValueCommand;
import org.talend.commons.ui.swt.proposal.ExtendedTextCellEditorWithProposal;
import org.talend.commons.ui.swt.tableviewer.behavior.DefaultCellModifier;
@@ -149,9 +148,6 @@ public class TableViewerCreator<B> extends TableViewerCreatorNotModifiable<B> im
@Override
public Table createTable() {
Table table = super.createTable();
DNDTableViewerHelper.addDndSupport(getTableViewer());
initCellModifier();
return table;

View File

@@ -1085,7 +1085,7 @@ public class ProcessorUtilities {
if (childBuildType == null) {
Property parentProperty = parentJobInfo.getProcessor().getProperty();
String parentBuildType = (String)parentProperty.getAdditionalProperties().get(TalendProcessArgumentConstant.ARG_BUILD_TYPE);
if ("ROUTE".equalsIgnoreCase(parentBuildType)) {
if (parentBuildType!= null && parentBuildType.contains("ROUTE")) {
childProperty.getAdditionalProperties().put(TalendProcessArgumentConstant.ARG_BUILD_TYPE, "OSGI");
}
}

View File

@@ -11,7 +11,7 @@
<packaging>pom</packaging>
<repositories>
<repository>
<id>Talend OpenSource Release</id>
<id>talend_open</id>
<url>https://artifacts-oss.talend.com/nexus/content/repositories/TalendOpenSourceRelease/</url>
</repository>
</repositories>

View File

@@ -243,12 +243,7 @@ public class LibraryDataService {
}
Map<String, Object> properties = resolveDescProperties(artifact, false);
if (properties != null && properties.size() > 0) {
//if the type is provided in mvnUrl, will not be replaced with the descriptor one.
boolean usePomPackingType = true;
if (!StringUtils.isBlank(MavenUrlHelper.parseMvnUrl(mvnUrl, false).getType())) {
usePomPackingType = false;
}
parseDescriptorResult(libraryObj, properties, false, usePomPackingType);
parseDescriptorResult(libraryObj, properties, false);
if (libraryObj.getLicenses().size() == 0) {
libraryObj.setLicenseMissing(true);
libraryObj.getLicenses().add(unknownLicense);
@@ -358,15 +353,10 @@ public class LibraryDataService {
}
private void parseDescriptorResult(Library libraryObj, Map<String, Object> properties, boolean is4Parent) throws Exception {
parseDescriptorResult(libraryObj, properties, is4Parent, true);
}
private void parseDescriptorResult(Library libraryObj, Map<String, Object> properties, boolean is4Parent, boolean usePomPackagingType) throws Exception {
if (properties.size() == 0) {
libraryObj.setPomMissing(true);
}
//If packaging type is provided in mvnUrl, not use the <packaging> setting in pom.xml.
if (!is4Parent && usePomPackagingType) {
if (!is4Parent) {
String type = String.valueOf(properties.get("type"));
libraryObj.setType(MavenConstants.PACKAGING_BUNDLE.equalsIgnoreCase(type) ? MavenConstants.PACKAGING_JAR : type); //$NON-NLS-1$
}

View File

@@ -1085,8 +1085,8 @@ public class ExtractMetaDataUtils {
} else if (driverJarPathArg.contains("/")) {
if (driverJarPathArg.contains(";")) {
String jars[] = driverJarPathArg.split(";");
List<String> jarNames = new ArrayList<>();
for (String jar : jars) {
jar = TalendQuoteUtils.removeQuotesIfExist(jar);
if (jar.startsWith(MavenUrlHelper.MVN_PROTOCOL)) {
setDriverPath(librairesManagerService, jarPathList, jar);
} else {

View File

@@ -34,6 +34,7 @@ import org.talend.core.model.properties.Project;
import org.talend.core.model.properties.RoutinesJarItem;
import org.talend.core.model.repository.ERepositoryObjectType;
import org.talend.core.model.routines.RoutinesUtil;
import org.talend.core.repository.utils.RepositoryNodeManager;
import org.talend.core.ui.ITestContainerProviderService;
import org.talend.repository.items.importexport.handlers.model.EmptyFolderImportItem;
import org.talend.repository.items.importexport.handlers.model.ImportItem;
@@ -282,7 +283,7 @@ public class ImportNodesBuilder {
}
private TypeImportNode findAndCreateParentTypeNode(ProjectImportNode projectNode, ERepositoryObjectType curType) {
if (curType == ERepositoryObjectType.METADATA_TACOKIT_JDBC || curType == ERepositoryObjectType.SNOWFLAKE) {
if (curType == ERepositoryObjectType.METADATA_TACOKIT_JDBC || RepositoryNodeManager.isSnowflake(curType)) {
curType = ERepositoryObjectType.METADATA_CONNECTIONS;
}
ERepositoryObjectType parentParentType = ERepositoryObjectType.findParentType(curType);

View File

@@ -64,7 +64,7 @@ public class TMCRepositoryUtil {
public static final int ALLOWED_PAT_MAX_DAYS = 60;
public static final long ALLOWED_PAT_MAX_MILLI_SECONDS = ALLOWED_PAT_MAX_DAYS * 24 * 60 * 1000;
public static final long ALLOWED_PAT_MAX_MILLI_SECONDS = 1000L * ALLOWED_PAT_MAX_DAYS * 24 * 60 * 60;
public static final Pattern DATA_CENTER_PATTERN = Pattern.compile("^http[s?]://tmc\\.(.*)(\\.cloud\\.talend\\.com.*)", Pattern.CASE_INSENSITIVE);