Skip to content

Commit

Permalink
TEIIDDES-1447
Browse files Browse the repository at this point in the history
Added back warning/status message on selection
changed label buttons to right/left arrows
  • Loading branch information
blafond committed Jan 22, 2013
1 parent 7aaa392 commit d436d17
Show file tree
Hide file tree
Showing 11 changed files with 215 additions and 83 deletions.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ public class Messages extends NLS {
public static String datatypeReconciler_statusTitle;
public static String datatypeReconciler_allResolvedMessage;
public static String datatypeReconciler_someUnresolvedConflicts;
public static String datatypeReconciler_selectionPanelInfoLabel;
public static String datatypeReconciler_changeTargetDatatypeTooltip;
public static String datatypeReconciler_matchedDatatypeTooltip;
public static String datatypeReconciler_convertSourceDatatypeTooltip;

static {
NLS.initializeMessages("org.teiid.designer.transformation.ui.messages", Messages.class); //$NON-NLS-1$
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,21 @@ public interface PluginConstants {
// ============================================================================================================================
// Constants

/**
*
*/
public static final String TRANSFORMATION_DIAGRAM_TYPE_ID = "transformationDiagramType"; //$NON-NLS-1$
/**
*
*/
public static final String DEPENDENCY_DIAGRAM_TYPE_ID = "dependencyDiagramType"; //$NON-NLS-1$
/**
*
*/
public static final String EMPTY_STRING = ""; //$NON-NLS-1$
/**
*
*/
public static final String TRANSFORMATION_EDITOR_ID = "org.teiid.designer.transformation.ui.editors.TransformationObjectEditorPage"; //$NON-NLS-1$

// ============================================================================================================================
Expand Down Expand Up @@ -61,8 +73,20 @@ interface Images {
String CONVERT_BUTTON_DISABLED_ICON = "icons/full/wizban/convert-button-disabled.png"; //$NON-NLS-1$
String ELIPSIS_BUTTON_ICON = "icons/full/wizban/elipsis-button.png"; //$NON-NLS-1$
String ELIPSIS_LONG_BUTTON_ICON = "icons/full/wizban/elipsis-long-button.png"; //$NON-NLS-1$

String ARROW_RIGHT_BUTTON_ICON = "icons/full/cview20/arrow-20x20.png"; //$NON-NLS-1$
String ARROW_RIGHT_BUTTON_DISABLED_ICON = "icons/full/cview20/arrow-20x20-disabled.png"; //$NON-NLS-1$
String ARROW_LEFT_BUTTON_ICON = "icons/full/cview20/arrow-left-20x20.png"; //$NON-NLS-1$
String ARROW_LEFT_BUTTON_DISABLED_ICON = "icons/full/cview20/arrow-left-20x20-disabled.png"; //$NON-NLS-1$
String ELIPSIS_ICON = "icons/full/cview20/elipsis-20x20.png"; //$NON-NLS-1$
String WARNING_BUTTON_ICON = "icons/full/cview20/warning-20x20.png"; //$NON-NLS-1$
String ARROW_LEFT_ICON = "icons/full/cview20/arrow-only-left-20x20.png"; //$NON-NLS-1$
String ARROW_RIGHT_ICON = "icons/full/cview20/arrow-only-20x20.png"; //$NON-NLS-1$
}

/**
*
*/
interface Prefs {

// Appearance Preferences
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,21 @@ DefaultUpdateMessageAmbigious=This view's select query is too complex.\nCustom u
DefaultUpdateMessageOverride=Define custom update SQL statement below.

#### DATATYPE RECONCILER TEXT
datatypeReconciler_helpText=Reconcile conflicts in your datatype bindings below. You can change the virtual column \
(target) datatypes to match your SQL symbol datatypes or you can convert your SQL symbol to match the datatypes \
of your virtual columns. Note that these changes will NOT be applied to your model until you click OK.
datatypeReconciler_helpText=Reconcile conflicts in your datatype bindings below. You canconvert your SQL symbol to \
match the datatypes of your virtual columns or you can change the virtual column (target) datatypes to match your \
SQL symbol datatypes. NOTE: these changes will NOT be applied to your model until you click OK.

datatypeReconciler_convertAllColumnDatatypesLabel=Change all column datatypes
datatypeReconciler_convertAllColumnDatatypesLabel=Change all target column datatypes
datatypeReconciler_convertAllColumnDatatypesTooltip=Convert all virtual column datatypes to match datatype of the source's sql symbol
datatypeReconciler_convertAllSqlSymbolsLabel=Convert all SQL symbol datatypes
datatypeReconciler_convertAllSqlSymbolsLabel=Convert all source SQL symbol datatypes
datatypeReconciler_convertAllSqlSymbolsTooltip=Convert all source SQL symbols to match virtual column datatypes
datatypeReconciler_targetColumnLabel=Target Column
datatypeReconciler_matchedTypeLabel=Matched Type
datatypeReconciler_matchedTypeLabel=Matched Datatype
datatypeReconciler_sourceSqlSymbolLabel=Source SQL Symbol
datatypeReconciler_statusTitle=Datatype Status
datatypeReconciler_allResolvedMessage=All datatype conflicts have been resolved.
datatypeReconciler_someUnresolvedConflicts=One or more of the Bindings has a type conflict.
datatypeReconciler_someUnresolvedConflicts=One or more of the bindings has a type conflict.
datatypeReconciler_selectionPanelInfoLabel=Selected Binding Info
datatypeReconciler_changeTargetDatatypeTooltip = Change target column datatype to match the datatype of the \n corresponding SQL symbol datatype
datatypeReconciler_matchedDatatypeTooltip =Current matched datatype to set as target column datatype
datatypeReconciler_convertSourceDatatypeTooltip =Add convert() SQL function to convert source datatype to target datatype.

0 comments on commit d436d17

Please sign in to comment.